diff options
| author | Conley Owens <cco3@android.com> | 2011-10-27 10:36:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 10:36:13 -0700 |
| commit | 5071047d7e01186e4d027a2180416ab48415cc36 (patch) | |
| tree | 7ea3ce8ed41b5ae804ad2f9e6e6b33cd8eefeda2 /core | |
| parent | d9ed9eba1bbe4a67fbc8a640e5c89241cd2e721b (diff) | |
| parent | 59d296623b0820fa0689b70c20af1db6b4435ab2 (diff) | |
| download | build-5071047d7e01186e4d027a2180416ab48415cc36.zip build-5071047d7e01186e4d027a2180416ab48415cc36.tar.gz build-5071047d7e01186e4d027a2180416ab48415cc36.tar.bz2 | |
Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE"
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 |