summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-08-25 09:32:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-25 09:32:00 -0700
commit7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8 (patch)
tree4b15025fcc16112ef150ba5e552d22039347a71a
parentcb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd (diff)
parentd6683f08c9ad0a924db663621844a6527164b99f (diff)
downloadbuild-7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8.zip
build-7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8.tar.gz
build-7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8.tar.bz2
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
-rw-r--r--core/combo/HOST_darwin-x86.mk15
1 files changed, 15 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 306ba1a..093ecbe 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -23,6 +23,21 @@
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)),)
+$(warning *****************************************************)
+$(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 $(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
HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error