aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-02-25 14:22:29 -0800
committerDavid 'Digit' Turner <digit@google.com>2010-02-25 14:22:29 -0800
commit9a0f1fba0cacee05513653a553052e97e475b51c (patch)
tree0adfdd3fed8b7020d81412c92c1b8ad79b1fa409
parent6d306b2b2d3df6b2a6d9518947aebfde166e879b (diff)
downloadexternal_qemu-9a0f1fba0cacee05513653a553052e97e475b51c.zip
external_qemu-9a0f1fba0cacee05513653a553052e97e475b51c.tar.gz
external_qemu-9a0f1fba0cacee05513653a553052e97e475b51c.tar.bz2
Fix standalone debug builds of the emulator.
This only affects builds performed with ./android-rebuild.sh --debug, not normal Android/SDK builds of the emulator program.
-rw-r--r--Makefile.android4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android
index 35e2fcf..a5385d4 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -16,7 +16,7 @@ ifeq ($(BUILD_DEBUG_EMULATOR),true)
MY_OPTIM := -O0 -g
endif
-MY_CFLAGS := $(CONFIG_INCLUDES) $(MY_OPTIM) -DCONFIG_MEMCHECK
+MY_CFLAGS := $(CONFIG_INCLUDES) $(MY_OPTIM)
# Overwrite configuration for debug builds.
#
@@ -25,6 +25,8 @@ ifeq ($(BUILD_DEBUG_EMULATOR),true)
-fno-PIC -falign-functions=0
endif
+MY_CFLAGS += -DCONFIG_MEMCHECK
+
MY_LDLIBS :=
# this is needed to build the emulator on 64-bit Linux systems