diff options
| author | Ying Wang <wangying@google.com> | 2012-06-05 15:25:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 15:25:39 -0700 |
| commit | 9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db (patch) | |
| tree | b237fb793aa755119a4c03f0d6886bf6ac5b5fb6 /core | |
| parent | c9f8b8d17ea17f722157aa58014dc1f1168996c1 (diff) | |
| parent | e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7 (diff) | |
| download | build-9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db.zip build-9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db.tar.gz build-9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db.tar.bz2 | |
am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index a3ba7d3..00b532f 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -29,21 +29,17 @@ HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32 endif # BUILD_HOST_64bit -# Use the Mac OSX SDK 10.5 if the build host is 10.6 -build_mac_version := $(shell sw_vers -productVersion) -ifneq ($(filter 10.6.%, $(build_mac_version)),) -sdk_105_root := /Developer/SDKs/MacOSX10.5.sdk -ifeq ($(wildcard $(sdk_105_root)),) +mac_sdk_version := 10.6 +mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk +ifeq ($(wildcard $(mac_sdk_root)),) $(warning *****************************************************) -$(warning * You are building on Mac OSX 10.6.) -$(warning * Can not find SDK 10.5 at $(sdk_105_root)) +$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) $(warning *****************************************************) $(error Stop.) endif -HOST_GLOBAL_CFLAGS += -isysroot $(sdk_105_root) -mmacosx-version-min=10.5 -HOST_GLOBAL_LDFLAGS += -isysroot $(sdk_105_root) -mmacosx-version-min=10.5 -endif # build_mac_version is 10.6 +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) HOST_GLOBAL_CFLAGS += -fPIC HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error |