commit e39ee4d5e043872b3ef8053678a9c6020d82d4b6
author Jim Huang <jserv@0xlab.org> Thu Nov 10 21:34:23 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 10 21:34:23 2011 +0000
tree d2adac5cba942bfc6ba22cdb6d2dafd3c49f8ee8
parent e04c2c21ee40f7e54924c586d5e7c148e0955ee1
parent cb48497ff2f84e8f7def981246ddc028ea126879

am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

core/combo/HOST_linux-x86.mk

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 @@
 	-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