diff options
| author | Ying Wang <wangying@google.com> | 2012-05-25 18:55:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-25 18:55:52 -0700 |
| commit | 9d50defb8b13324d2b81f76dace70e2baeaa7cf1 (patch) | |
| tree | 4a2aa72b9927e1970d4499e892b6b29d4aacc402 /core/combo/HOST_darwin-x86.mk | |
| parent | 4c1b310b9bdbebef83d298d305beb0122a7204f6 (diff) | |
| download | build-9d50defb8b13324d2b81f76dace70e2baeaa7cf1.zip build-9d50defb8b13324d2b81f76dace70e2baeaa7cf1.tar.gz build-9d50defb8b13324d2b81f76dace70e2baeaa7cf1.tar.bz2 | |
Revert "Use Mac OS X SDK 10.6."
This reverts commit 4c1b310b9bdbebef83d298d305beb0122a7204f6
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index c84e375..f2dc7de 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -34,17 +34,21 @@ ifneq ($(strip $(BUILD_HOST_static)),) HOST_GLOBAL_LDFLAGS += -static endif # BUILD_HOST_static -mac_sdk_version := 10.6 -mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk -ifeq ($(wildcard $(mac_sdk_root)),) +# 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)),) $(warning *****************************************************) -$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) +$(warning * You are building on Mac OSX 10.6.) +$(warning * Can not find SDK 10.5 at $(sdk_105_root)) $(warning *****************************************************) $(error Stop.) 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) +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 += -fPIC -funwind-tables HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error |