From 51f9bb02dab7d7207b6c1976160dfeb951d13be1 Mon Sep 17 00:00:00 2001 From: Al Sutton Date: Thu, 7 Jun 2012 19:10:13 +0100 Subject: [PATCH] XCode 4.3+ compatibility check-in XCode 4.3 and later use a different location for SDKs. This check in ensures the build checks for the new location as well as the old one. Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241 Signed-off-by: Al Sutton --- core/combo/HOST_darwin-x86.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 72117a2d9..5ab2c0da6 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -26,11 +26,16 @@ HOST_GLOBAL_LDFLAGS += -m32 mac_sdk_version := 10.6 mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk 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 * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) +$(warning * or $(recent_xcode4_mac_sdk_root)) $(warning *****************************************************) $(error Stop.) 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_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)