tests: gcc version is now specified upon building

git-svn-id: http://pugixml.googlecode.com/svn/trunk@427 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-05-17 07:42:34 +00:00
parent 2412872c09
commit dd9de685eb
3 changed files with 9 additions and 4 deletions

View File

@ -41,7 +41,7 @@ else
BUILD = build/$(toolset)/standard/$(configuration) ;
}
if ( $(toolset:I=^mingw) || $(toolset) = gcc )
if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
{
CCFLAGS = -fprofile-arcs -ftest-coverage ;
LDFLAGS = -fprofile-arcs ;

View File

@ -1,8 +1,8 @@
# Rules for Jamfile.jam
if ( $(toolset:I=^mingw) || $(toolset) = "gcc" )
if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
{
if ( $(toolset) = "gcc" )
if ( $(toolset:I^=gcc) )
{
GCCPATH = "" ;
}

View File

@ -15,8 +15,13 @@ sub permute
@result;
}
sub gcctoolset
{
return 'gcc' . `gcc -dumpversion`;
}
$fast = (shift eq 'fast');
@toolsets = ($^O =~ /win/i) ? (bcc, cw, dmc, ic8, mingw34, mingw44, mingw45, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : (gcc);
@toolsets = ($^O =~ /win/i) ? (bcc, cw, dmc, ic8, mingw34, mingw44, mingw45, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : (&gcctoolset());
@configurations = (debug, release);
@defines = (PUGIXML_NO_XPATH, PUGIXML_NO_EXCEPTIONS, PUGIXML_NO_STL, PUGIXML_WCHAR_MODE);