diff options
| author | Jim Huang <jserv@0xlab.org> | 2011-09-07 01:25:28 +0800 |
|---|---|---|
| committer | Jim Huang <jserv@0xlab.org> | 2011-09-07 01:29:08 +0800 |
| commit | e9cbfa60c8dd60d04570d8bf7bd0d54a4304baf5 (patch) | |
| tree | 4e1ad4cfd78b7377b60cd0c906f71ffc1e7973b4 | |
| parent | 329fcec56f72cb311c73c6aac00901f424db0f6f (diff) | |
| download | replicant_build-e9cbfa60c8dd60d04570d8bf7bd0d54a4304baf5.zip replicant_build-e9cbfa60c8dd60d04570d8bf7bd0d54a4304baf5.tar.gz replicant_build-e9cbfa60c8dd60d04570d8bf7bd0d54a4304baf5.tar.bz2 | |
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:
Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors
In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.
Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index c871613..1a5e17f 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -58,6 +58,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 |