summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-07 09:01:36 +0000
committerarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-07 09:01:36 +0000
commitd2b85e2a5f94aea7a7ad5dd49a30b957a5cff553 (patch)
tree4e0f824f9825e71f9d57d300ebf8bed2fcb8b63e
parentca8d43ba03df6302235eeb667ef0573fc42bc8ad (diff)
tests: Fixed gcc version detection
git-svn-id: http://pugixml.googlecode.com/svn/trunk@852 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--Jamrules.jam6
1 files changed, 3 insertions, 3 deletions
diff --git a/Jamrules.jam b/Jamrules.jam
index 709c100..54f3191 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -69,7 +69,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
LDFLAGS += $(ARCH) ;
}
- local VERSION = [ Shell "$(GCCPATH)gcc -dumpversion" ] ;
+ GCCVERSION = [ Shell "$(GCCPATH)gcc -dumpversion" ] ;
rule GetCFlags CONFIG : DEFINES
{
@@ -81,7 +81,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ;
# gcc 4.0 has some warning regressions
- if ( ! $(VERSION:I=4\.0) )
+ if ( ! $(GCCVERSION:I=4\.0) )
{
RESULT += -Wold-style-cast ; # gives warnings for fpclassify() on gcc 4.0.1
RESULT += -Wswitch-default ; # gives false-positives for couple of switches on template argument on gcc 4.0.1
@@ -89,7 +89,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
}
# these warnings are supported on newer GCC versions only
- if ( $(VERSION) >= "4.4.0" )
+ if ( $(GCCVERSION) >= "4.4.0" )
{
RESULT += -Wstrict-null-sentinel -Wlogical-op -Wmissing-declarations ;
}