diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-05-06 18:37:57 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-31 14:31:08 -0400 |
| commit | fed806c3af7b6421e17ac50f8129dbe4fd693e4a (patch) | |
| tree | 577a3aa63a69a57d98e7430910c883451f1b3b02 /debug | |
| parent | 3091725976856160a5427b03a9586af534b63750 (diff) | |
| download | glibc-fed806c3af7b6421e17ac50f8129dbe4fd693e4a.tar.gz glibc-fed806c3af7b6421e17ac50f8129dbe4fd693e4a.tar.xz glibc-fed806c3af7b6421e17ac50f8129dbe4fd693e4a.zip | |
tests: move -D_FORTIFY_SOURCE to CPPFLAGS
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 <vapier@gentoo.org>
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/debug/Makefile b/debug/Makefile index fb8c28572f..4c01a66e39 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -79,10 +79,14 @@ 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 \ - -D_FORTIFY_SOURCE=1 -CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables \ - -D_FORTIFY_SOURCE=1 + +# Need to make sure the settings here override what configure might have +# set up for us, so keep the CFLAGS/CPPFLAGS split logical as the order is: +# <user CFLAGS> <test CFLAGS> <user CPPFLAGS> <test CPPFLAGS> +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. |