This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]


The -D_FORTIFY_SOURCE flags are being added to the test-specific CFLAGS
values when they should be the test-specific CPPFLAGS values.  Otherwise
the values don't override the user-specified CPPFLAGS and might end up
breaking the tests.

Signed-off-by: Mike Frysinger <>

2012-05-06  Mike Frysinger  <>

	* debug/Makefile (CFLAGS-tst-longjmp_chk.c): Delete
	(CPPFLAGS-tst-longjmp_chk.c): Define.
	(CFLAGS-tst-longjmp_chk2.c): Delete -D_FORTIFY_SOURCE=1.
	(CPPFLAGS-tst-longjmp_chk2.c): Define.
	* wcsmbs/Makefile (CPPFLAGS-tst-wchar-h.c): Rename from
	- add a comment about flag split

 debug/Makefile  |   11 +++++++----
 wcsmbs/Makefile |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debug/Makefile b/debug/Makefile
index fb8c285..e8747c4 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -79,10 +79,13 @@ CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables \
-CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables \
+# Need to make sure the settings here override what configure might
+# have set up for us, so keep the CFLAGS/CPPFLAGS split logical.
+CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk.c = -D_FORTIFY_SOURCE=1
+CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk2.c = -D_FORTIFY_SOURCE=1
 # We know these tests have problems with format strings, this is what
 # we are testing.  Disable that warning.
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index c4d31d9..3455278 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -67,7 +67,7 @@ CFLAGS-wcstoull_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstod_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstold_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstof_l.c = $(strtox-CFLAGS)
-CFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
+CPPFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
 CFLAGS-isoc99_wscanf.c += $(exceptions)
 CFLAGS-isoc99_fwscanf.c += $(exceptions)

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]