diff options
| author | Michael Edwards <m.k.edwards@gmail.com> | 2011-11-09 02:22:00 +0000 |
|---|---|---|
| committer | Patrik Ryd <patrik.ryd@linaro.org> | 2011-11-11 15:59:47 +0100 |
| commit | a73be309c69433c062306d0d5309e0b77993c7cd (patch) | |
| tree | e8442c298a7c865d948484c6fa5b904add45e700 | |
| parent | 2365033da4ee786990fd24caed977a9694886687 (diff) | |
| download | build-a73be309c69433c062306d0d5309e0b77993c7cd.tar.gz | |
Replace -D_FORTIFY_SOURCE=0 with -U_FORTIFY_SOURCE.
This fixes failures when the build host's GCC has a built-in setting of
_FORTIFY_SOURCE (e. g., on Ubuntu 11.10's gcc 4.6). It should be
equally effective as a workaround for the original glibc bug.
Change-Id: I0f6212638ec9a59839c9524acfaa3ae789e1751b
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index c871613fe0..650b5ce9d7 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -57,7 +57,8 @@ 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 +# Work around broken implementation of longjmp_chk in glibc 2.11 and 2.12. +# See http://sourceware.org/bugzilla/show_bug.cgi?id=11968. +HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined |