diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-07-25 10:39:58 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-25 10:39:59 -0700 |
| commit | 9096e372a1bfc2c5b812346047dc25648c7dafb8 (patch) | |
| tree | f567a053182e813666a4b440a79bfd839b34278b /Makefile.android | |
| parent | fd86ec1a03668d3187790de940cbd0fba41640dd (diff) | |
| parent | 83df59cef8e9bb631efec48c8baedce1647e90c1 (diff) | |
| download | external_qemu-9096e372a1bfc2c5b812346047dc25648c7dafb8.zip external_qemu-9096e372a1bfc2c5b812346047dc25648c7dafb8.tar.gz external_qemu-9096e372a1bfc2c5b812346047dc25648c7dafb8.tar.bz2 | |
Merge "Enable 64-bit emulator for MacOSX host"
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.android b/Makefile.android index 0441652..817c562 100644 --- a/Makefile.android +++ b/Makefile.android @@ -84,18 +84,18 @@ ifeq ($(HOST_OS),darwin) endif ifneq ($(filter 10.5 10.5.% 10.6 10.6.%,$(DARWIN_VERSION)),) # We are on Leopard or Snow Leopard - MSDK=10.5 + OSX_VERSION=10.5 else # We are on Lion or beyond, and 10.6 SDK is the minimum in Xcode 4.x - MSDK=10.6 + OSX_VERSION=10.6 endif - MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk + MACOSX_SDK := /Developer/SDKs/MacOSX$(OSX_VERSION).sdk ifeq ($(strip $(wildcard $(MACOSX_SDK))),) - $(info Please install the $(MSDK) SDK on this machine at $(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=$(MSDK) -DMACOSX_DEPLOYMENT_TARGET=$(MSDK) - MY_LDLIBS += -isysroot $(MACOSX_SDK) -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MSDK) + 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) endif # BUILD_STANDALONE_EMULATOR is only defined when building with |