diff options
| author | Al Sutton <al@funkyandroid.com> | 2012-06-07 19:10:13 +0100 |
|---|---|---|
| committer | Al Sutton <al@funkyandroid.com> | 2012-06-07 19:10:13 +0100 |
| commit | 51f9bb02dab7d7207b6c1976160dfeb951d13be1 (patch) | |
| tree | 3b8ea8364c950273393d5d50f3de34d23be7f6da /core | |
| parent | 47450542a3d07eb79c80035c701638b1f07eb1c0 (diff) | |
| download | build-51f9bb02dab7d7207b6c1976160dfeb951d13be1.zip build-51f9bb02dab7d7207b6c1976160dfeb951d13be1.tar.gz build-51f9bb02dab7d7207b6c1976160dfeb951d13be1.tar.bz2 | |
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 <al@funkyandroid.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 72117a2..5ab2c0d 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) |