organicmaps/pugixml
13
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity Actions

tests: Fixed gcc version detection

Browse source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@852 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-03-07 09:01:36 +00:00
parent ca8d43ba03
commit d2b85e2a5f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Jamrules.jam
View file

@ -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 ;
}