Skip to content
Snippets Groups Projects
Commit d2b85e2a authored by arseny.kapoulkine@gmail.com's avatar arseny.kapoulkine@gmail.com
Browse files

tests: Fixed gcc version detection

git-svn-id: http://pugixml.googlecode.com/svn/trunk@852 99668b35-9821-0410-8761-19e4c4f06640
parent ca8d43ba
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset ...@@ -69,7 +69,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
LDFLAGS += $(ARCH) ; LDFLAGS += $(ARCH) ;
} }
local VERSION = [ Shell "$(GCCPATH)gcc -dumpversion" ] ; GCCVERSION = [ Shell "$(GCCPATH)gcc -dumpversion" ] ;
rule GetCFlags CONFIG : DEFINES rule GetCFlags CONFIG : DEFINES
{ {
...@@ -81,7 +81,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset ...@@ -81,7 +81,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ; RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ;
# gcc 4.0 has some warning regressions # 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 += -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 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 ...@@ -89,7 +89,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset
} }
# these warnings are supported on newer GCC versions only # 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 ; RESULT += -Wstrict-null-sentinel -Wlogical-op -Wmissing-declarations ;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment