summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-08-05 16:00:20 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-08-26 11:07:05 +0100
commit3683c2b2d0b5e7d57374860147ca827da596bad5 (patch)
tree238a53c30cab61219f675e20ee5805dfce38eae6
parentc98b41de5596c675c603ef43ae9570133f1a9921 (diff)
Use the right variable names for the compiler flags in XORG_TESTSET_CFLAG
Whilst populating the xorg_cv_ cache entries, and the subsequent xorg_testset_, we always include the FLAG_PREFIX in the name, to distinguish between C and C++ iterations. However, in the body of the test function, we dropped the FLAG_PREFIX expansion and so always used the empty string and hence did not correctly detect incorrect flags. The bug was introduced with commit 51f69514e65637f575df901ef942515e70314f6a Author: Chase Douglas <chase.douglas@canonical.com> Date: Mon Mar 12 11:49:28 2012 -0700 Separate unknown warning options by language Reported-and-tested-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Sedat Dilek <sedat.dilek@gmail.com> Cc: Chase Douglas <chase.douglas@canonical.com> Cc: Gaetan Nadon<memsize@videotron.ca> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--xorg-macros.m4.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index d589ebd..cd76fca 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -1543,11 +1543,11 @@ fi
found="no"
m4_foreach([flag], m4_cdr($@), [
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
fi