diff options
| author | Ying Wang <wangying@android.com> | 2012-06-07 11:25:37 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-07 11:25:37 -0700 |
| commit | 4b030617e74405779c657b98fa2b2e521adf4908 (patch) | |
| tree | 3b8ea8364c950273393d5d50f3de34d23be7f6da | |
| parent | 47450542a3d07eb79c80035c701638b1f07eb1c0 (diff) | |
| parent | 51f9bb02dab7d7207b6c1976160dfeb951d13be1 (diff) | |
| download | build-4b030617e74405779c657b98fa2b2e521adf4908.tar.gz | |
Merge "XCode 4.3+ compatibility check-in"
| -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 72117a2d9d..5ab2c0da67 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) |