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

am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"

Browse Source 
* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
  XCode 4.3+ compatibility check-in
This commit is contained in:
Ying Wang
2012-06-07 12:02:06 -07:00
committed by Android Git Automerger
parent 9561c9cc76 3da13457cf
commit f1e424a636
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,11 +32,16 @@ endif # BUILD_HOST_64bit
mac_sdk_version := 10.6 mac_sdk_version := 10.6
mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifeq ($(wildcard $(mac_sdk_root)),) ifeq ($(wildcard $(mac_sdk_root)),)
recent_xcode4_mac_sdk_root := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifeq ($(wildcard $(recent_xcode4_mac_sdk_root)),)
$(warning *****************************************************) $(warning *****************************************************)
$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) $(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root))
$(warning * or $(recent_xcode4_mac_sdk_root))
$(warning *****************************************************) $(warning *****************************************************)
$(error Stop.) $(error Stop.)
endif endif
mac_sdk_root := $(recent_xcode4_mac_sdk_root)
endif
HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) 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_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)