diff options
| author | Jim Huang <jserv@0xlab.org> | 2011-09-07 01:25:28 +0800 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2011-11-10 13:28:13 -0800 |
| commit | cb48497ff2f84e8f7def981246ddc028ea126879 (patch) | |
| tree | 86d4760268b8d7e3a1d55e14a8676a06eb75b155 /core | |
| parent | e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593 (diff) | |
| download | build-cb48497ff2f84e8f7def981246ddc028ea126879.zip build-cb48497ff2f84e8f7def981246ddc028ea126879.tar.gz build-cb48497ff2f84e8f7def981246ddc028ea126879.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
Diffstat (limited to 'core')
| -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 5ae4972..7df2893 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -53,6 +53,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 |