summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Huang <jserv@0xlab.org>2011-11-10 21:35:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-10 21:35:56 +0000
commitba2c734f71202522464db540260b0df696d26c06 (patch)
tree74274af384d6807c9fab637996849fa57cf36922
parentdd1926847e3025bb931fb4b045840055bb6d9f80 (diff)
parente39ee4d5e043872b3ef8053678a9c6020d82d4b6 (diff)
downloadbuild-ba2c734f71202522464db540260b0df696d26c06.zip
build-ba2c734f71202522464db540260b0df696d26c06.tar.gz
build-ba2c734f71202522464db540260b0df696d26c06.tar.bz2
am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6': HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
-rw-r--r--core/combo/HOST_linux-x86.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 5ae4972..7df2893 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -53,6 +53,6 @@ HOST_GLOBAL_CFLAGS += \
-include $(call select-android-config-h,linux-x86)
# Disable new longjmp in glibc 2.11 and later. See bug 2967937.
-HOST_GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=0
+HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined