diff options
| author | Michael Edwards <m.k.edwards@gmail.com> | 2011-11-09 02:22:00 +0000 |
|---|---|---|
| committer | Michael Edwards <m.k.edwards@gmail.com> | 2011-11-10 18:27:44 +0000 |
| commit | 7e867732af6bba23db8511477d5d8fc6bbfaef04 (patch) | |
| tree | a4e613e90588fa20ee79dc8afe2fac122dcf3924 | |
| parent | 2c113261915a98bee9718ced8ef7c834554ad9e1 (diff) | |
| download | build-7e867732af6bba23db8511477d5d8fc6bbfaef04.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: I6193cead5ab747fa30974fb330efa8f89347a035
| -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 |