From ba1f8aa68ec552a7b07d3aa90541b61ff7233f9c Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sat, 7 Apr 2012 17:15:59 -0600 Subject: [PATCH] don't fail build on missing iOS SDK unless actually building for iOS --- makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/makefile b/makefile index 49a2bf0ff6..4a481f9c7b 100755 --- a/makefile +++ b/makefile @@ -322,17 +322,18 @@ ifeq ($(platform),darwin) sdk-dir = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/SDKs - ios-version := $(shell if test -d $(sdk-dir)/iPhoneOS5.1.sdk; then echo 5.1; \ - elif test -d $(sdk-dir)/iPhoneOS5.0.sdk; then echo 5.0; \ - elif test -d $(sdk-dir)/iPhoneOS4.3.sdk; then echo 4.3; \ - elif test -d $(sdk-dir)/iPhoneOS4.2.sdk; then echo 4.2; \ - else echo; fi) - - ifeq ($(ios-version),) - x := $(error "couldn't find SDK for iOS version") - endif - ifeq ($(arch),arm) + ios-version := \ + $(shell if test -d $(sdk-dir)/iPhoneOS5.1.sdk; then echo 5.1; \ + elif test -d $(sdk-dir)/iPhoneOS5.0.sdk; then echo 5.0; \ + elif test -d $(sdk-dir)/iPhoneOS4.3.sdk; then echo 4.3; \ + elif test -d $(sdk-dir)/iPhoneOS4.2.sdk; then echo 4.2; \ + else echo; fi) + + ifeq ($(ios-version),) + x := $(error "couldn't find SDK for iOS version") + endif + ifeq ($(build-arch),powerpc) converter-cflags += -DOPPOSITE_ENDIAN endif