Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b030617 authored by Ying Wang's avatar Ying Wang Committed by android code review
Browse files

Merge "XCode 4.3+ compatibility check-in"

parents 47450542 51f9bb02

core/combo/HOST_darwin-x86.mk

+5 −0
Original line number Diff line number Diff line
@@ -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)