mirror of
https://github.com/corda/corda.git
synced 2025-01-04 04:04:27 +00:00
don't fail build on missing iOS SDK unless actually building for iOS
This commit is contained in:
parent
2fedfdea5b
commit
ba1f8aa68e
21
makefile
21
makefile
@ -322,17 +322,18 @@ ifeq ($(platform),darwin)
|
|||||||
|
|
||||||
sdk-dir = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/SDKs
|
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)
|
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)
|
ifeq ($(build-arch),powerpc)
|
||||||
converter-cflags += -DOPPOSITE_ENDIAN
|
converter-cflags += -DOPPOSITE_ENDIAN
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user