diff options
| author | Ying Wang <wangying@android.com> | 2012-06-07 12:02:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 12:02:06 -0700 |
| commit | f1e424a63658eb15ba61ca2eb8f0df38733188fe (patch) | |
| tree | 6e560849fc8f30d932037b758bc1ce33e3d4bf4a /core | |
| parent | 9561c9cc767ef34f692da62211c0d2488d31966c (diff) | |
| parent | 3da13457cfa46cf7d46b57c00f387c7c310b2dba (diff) | |
| download | build-f1e424a63658eb15ba61ca2eb8f0df38733188fe.zip build-f1e424a63658eb15ba61ca2eb8f0df38733188fe.tar.gz build-f1e424a63658eb15ba61ca2eb8f0df38733188fe.tar.bz2 | |
am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
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 00b532f..2ad3dd9 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -32,11 +32,16 @@ endif # BUILD_HOST_64bit 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) |