StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use Mac OS X SDK 10.6."

Browse Source 
This reverts commit 4c1b310b9b
This commit is contained in:
Ying Wang
2012-05-25 18:55:52 -07:00
committed by Android (Google) Code Review
parent 4c1b310b9b
commit 9d50defb8b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/combo/HOST_darwin-x86.mk
View File

@@ -34,17 +34,21 @@ ifneq ($(strip $(BUILD_HOST_static)),)
HOST_GLOBAL_LDFLAGS += -static HOST_GLOBAL_LDFLAGS += -static
endif # BUILD_HOST_static endif # BUILD_HOST_static
mac_sdk_version := 10.6 # Use the Mac OSX SDK 10.5 if the build host is 10.6
mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk build_mac_version := $(shell sw_vers -productVersion)
ifeq ($(wildcard $(mac_sdk_root)),) ifneq ($(filter 10.6.%, $(build_mac_version)),)
sdk_105_root := /Developer/SDKs/MacOSX10.5.sdk
ifeq ($(wildcard $(sdk_105_root)),)
$(warning *****************************************************) $(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 *****************************************************) $(warning *****************************************************)
$(error Stop.) $(error Stop.)
endif endif
HOST_GLOBAL_CFLAGS += -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 $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) 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_GLOBAL_CFLAGS += -fPIC -funwind-tables
HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error