diff options
| author | Ying Wang <wangying@android.com> | 2012-06-07 12:03:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 12:03:46 -0700 |
| commit | fcc2a604af482dfc1d6f905b0f5ddaf856536389 (patch) | |
| tree | a5f978c39d87cf679f5cdbc9438fc2a549c7ff59 /core/combo/HOST_darwin-x86.mk | |
| parent | 6747e83549b8192fb4c26ceb57dacdfea33b80aa (diff) | |
| parent | f1e424a63658eb15ba61ca2eb8f0df38733188fe (diff) | |
| download | build-fcc2a604af482dfc1d6f905b0f5ddaf856536389.zip build-fcc2a604af482dfc1d6f905b0f5ddaf856536389.tar.gz build-fcc2a604af482dfc1d6f905b0f5ddaf856536389.tar.bz2 | |
am f1e424a6: am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe':
XCode 4.3+ compatibility check-in
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
| -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 229eaf0..a524e17 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -37,11 +37,16 @@ endif # BUILD_HOST_static 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) |