aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.target
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-03-23 17:35:11 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-03-23 17:35:11 +0800
commitd0f2ab6936edd2601fe5edac934a1af63d0715ae (patch)
tree1b2145a9c21741c3225e110f63c28f8f7c08c81a /Makefile.target
parentefc1f78eb19df182e8d6cd49e228c15f360691d4 (diff)
downloadexternal_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.zip
external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.gz
external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.bz2
Re-enable Linux 64-bit emulator
Restore rules in Makefiles for Linux 64-bit emulator, now that all the dependencies are merged (toolchain, lib64*.{a,so}, etc) Change-Id: I25ecc53837ad9f10ceafb89d9e1d7a3124ce2d71
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index 92ac855..1961acf 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -246,7 +246,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),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU))
LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -433,7 +433,7 @@ $(call end-emulator-program)
## another for 64-bit, see note in file Makefile.common emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH))
LOCAL_STATIC_LIBRARIES += \