aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-11-10 18:33:12 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2011-11-10 18:33:12 +0000
commitfd7855b2d770e47e1d59398ca58b0a8d26c94628 (patch)
treee0ba6a8b76b67d960872f65ed391783325787292
parent4581d4ad733b39dbfc7186e65014241fb55f287a (diff)
downloadbuild-fd7855b2d770e47e1d59398ca58b0a8d26c94628.tar.gz
Revert "Remove -D_FORTIFY_SOURCE=0; it conflicts with gcc 4.6 defaults."
This reverts commit 4581d4ad733b39dbfc7186e65014241fb55f287a
-rw-r--r--core/combo/HOST_linux-x86.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index b51240b4be..c871613fe0 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -57,4 +57,7 @@ HOST_GLOBAL_CFLAGS += -fPIC
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_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined