diff options
author | Ying Wang <wangying@google.com> | 2012-05-25 15:14:12 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-05 14:23:22 -0700 |
commit | 644dc164cc932322499d940609f0d8548067ffba (patch) | |
tree | 2819272a84c0b722b5101e585bda733fe66b9a9d /core | |
parent | fed2587c164d27de79ca7900e920a15cbf62f990 (diff) | |
download | build-644dc164cc932322499d940609f0d8548067ffba.zip build-644dc164cc932322499d940609f0d8548067ffba.tar.gz build-644dc164cc932322499d940609f0d8548067ffba.tar.bz2 |
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
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 aeb91c2..72117a2 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -23,21 +23,17 @@ HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32 -# 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 |