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.target | |
| 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.target')
| -rw-r--r-- | Makefile.target | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 608761c..dcf9a80 100644 --- a/Makefile.target +++ b/Makefile.target @@ -281,7 +281,7 @@ $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c) $(call end-emulator-library) ## another for 64-bit, see note in file Makefile.common emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU)) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -290,7 +290,7 @@ ifeq ($(HOST_OS),linux) $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c) $(call end-emulator-library) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin @@ -475,7 +475,7 @@ $(call end-emulator-program) ## another for 64-bit, see note in file Makefile.common emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH)) LOCAL_STATIC_LIBRARIES += \ @@ -493,5 +493,5 @@ ifeq ($(HOST_OS),linux) $(call gen-hw-config-defs) $(call end-emulator-program) endif # BUILD_STANDALONE_EMULATOR == nil -endif # HOST_OS == linux +endif # HOST_OS == linux || darwin |