From 644dc164cc932322499d940609f0d8548067ffba Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 25 May 2012 15:14:12 -0700 Subject: [PATCH] Use Mac OS X SDK 10.6. Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54 --- CleanSpec.mk | 3 +++ core/combo/HOST_darwin-x86.mk | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index d103aa6d3..ea28ec004 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -109,6 +109,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# Now we switched to build against Mac OS X SDK 10.6 +$(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index aeb91c288..72117a2d9 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 -- 2.11.0