diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-22 09:55:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-22 09:55:25 -0700 |
| commit | e3479ea5033e2ede36f6f771dd3a6ea315505efd (patch) | |
| tree | 4157622a432aacbc25fbd79c25a4898d18d22728 | |
| parent | 9c6df3cdcc938302ba3176f56ec9b19c2d226227 (diff) | |
| parent | 15012c115dca7bc0d2edd8dd2689117546b1360e (diff) | |
| download | build-e3479ea5033e2ede36f6f771dd3a6ea315505efd.zip build-e3479ea5033e2ede36f6f771dd3a6ea315505efd.tar.gz build-e3479ea5033e2ede36f6f771dd3a6ea315505efd.tar.bz2 | |
am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
Build on Mac OS X : add experimental SDK versions
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 23f3994..668998f 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -35,19 +35,40 @@ HOST_GLOBAL_LDFLAGS += -static endif # BUILD_HOST_static build_mac_version := $(shell sw_vers -productVersion) -mac_sdk_version := 10.6 + +ifneq ($(strip $(BUILD_MAC_SDK_EXPERIMENTAL)),) +# SDK 10.7 and higher is not fully compatible with Android. +mac_sdk_versions_supported := 10.7 10.8 +else +mac_sdk_versions_supported := 10.6 +endif # BUILD_MAC_SDK_EXPERIMENTAL +mac_sdk_versions_installed := $(shell xcodebuild -showsdks |grep macosx | sort | sed -e "s/.*macosx//g") +mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported))) +ifeq ($(mac_sdk_version),) +mac_sdk_version := $(firstword $(mac_sdk_versions_supported)) +endif + +mac_sdk_path := $(shell xcode-select -print-path) +ifeq ($(findstring /Applications,$(mac_sdk_path)),) +# Legacy Xcode mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk +else +# Xcode 4.4(App Store) or higher +# /Applications/Xcode*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk +mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk +endif + ifeq ($(wildcard $(mac_sdk_root)),) -recent_xcode4_mac_sdk_root := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk -ifeq ($(wildcard $(recent_xcode4_mac_sdk_root)),) $(warning *****************************************************) $(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) -$(warning * or $(recent_xcode4_mac_sdk_root)) +ifeq ($(strip $(BUILD_MAC_SDK_EXPERIMENTAL)),) +$(warning * If you wish to build using higher version of SDK, ) +$(warning * try setting BUILD_MAC_SDK_EXPERIMENTAL=1 before ) +$(warning * rerunning this command ) +endif $(warning *****************************************************) $(error Stop.) endif -mac_sdk_root := $(recent_xcode4_mac_sdk_root) -endif HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) |