From 9d50defb8b13324d2b81f76dace70e2baeaa7cf1 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 25 May 2012 18:55:52 -0700 Subject: [PATCH] Revert "Use Mac OS X SDK 10.6." This reverts commit 4c1b310b9bdbebef83d298d305beb0122a7204f6 --- core/combo/HOST_darwin-x86.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index c84e375f7..f2dc7def8 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 -- 2.11.0