diff options
| author | SangWook Han <sangwook.han@gmail.com> | 2012-07-26 08:06:58 +0900 |
|---|---|---|
| committer | SangWook Han <sangwook.han@gmail.com> | 2012-07-27 02:07:51 +0900 |
| commit | 08c1bde81023da4bde0a69491fd0f24c68ad3740 (patch) | |
| tree | d588be7126ea764576ec67130b0e12f90e152725 | |
| parent | c736fb6e80a357bdde308f857bcbbc48f4c41eba (diff) | |
| download | external_qemu-08c1bde81023da4bde0a69491fd0f24c68ad3740.zip external_qemu-08c1bde81023da4bde0a69491fd0f24c68ad3740.tar.gz external_qemu-08c1bde81023da4bde0a69491fd0f24c68ad3740.tar.bz2 | |
Fix MacAppStore version of Xcode build on MacOSX 10.7
Use mac_sdk and mac_sdk_version which is declared in
/build/core/combo/HOST_darwin-x86.mk
Change-Id: I930173d13e5417aec49675b52d414d147b3c9597
| -rw-r--r-- | Makefile.android | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/Makefile.android b/Makefile.android index 905622e..0c083c0 100644 --- a/Makefile.android +++ b/Makefile.android @@ -78,26 +78,8 @@ endif ifeq ($(HOST_OS),darwin) MY_CFLAGS += -mdynamic-no-pic -D_DARWIN_C_SOURCE=1 - # When building on Leopard or above, we need to use the 10.4 SDK - # or the generated binary will not run on Tiger. - DARWIN_VERSION := $(strip $(shell sw_vers -productVersion)) - ifneq ($(filter 10.1 10.2 10.3 10.1.% 10.2.% 10.3.% 10.4 10.4.%,$(DARWIN_VERSION)),) - $(error Building the Android emulator requires OS X 10.5 or above) - endif - ifneq ($(filter 10.5 10.5.% 10.6 10.6.%,$(DARWIN_VERSION)),) - # We are on Leopard or Snow Leopard - OSX_VERSION=10.5 - else - # We are on Lion or beyond, and 10.6 SDK is the minimum in Xcode 4.x - OSX_VERSION=10.6 - endif - MACOSX_SDK := /Developer/SDKs/MacOSX$(OSX_VERSION).sdk - ifeq ($(strip $(wildcard $(MACOSX_SDK))),) - $(info Please install the $(OSX_VERSION) SDK on this machine at $(MACOSX_SDK)) - $(error Aborting the build.) - endif - MY_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) - MY_LDLIBS += -isysroot $(MACOSX_SDK) -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) + MY_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version) + MY_LDLIBS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) endif # BUILD_STANDALONE_EMULATOR is only defined when building with @@ -220,7 +202,7 @@ endif ifeq ($(HOST_OS),darwin) QEMU_SYSTEM_LDLIBS += -Wl,-framework,Cocoa,-framework,QTKit,-framework,CoreVideo - ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(DARWIN_VERSION)),) + ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(build_mac_version)),) # 10.7+ with XCode4 needs to be explicitly told the dynamic library # lookup symbols in the precompiled libSDL are resolved at # runtime |