Merge pull request #1 from jlebar/gingerbread-b2g

Fix GCC 4.6 build error (_FORTIFY_SOURCE redefined)
joneschrisg · Oct 18, 2011 · 1b9f7df · 1b9f7df
2 parents 16e0841 + 96d5e8f
commit 1b9f7df
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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