diff options
| -rw-r--r-- | Jamrules.jam | 13 | ||||
| -rw-r--r-- | tests/autotest-local.pl | 2 | ||||
| -rw-r--r-- | tests/autotest-report.pl | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index a6dbc75..9c6c018 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -360,6 +360,17 @@ else if ( $(toolset:I=^bcc) ) } else if ( $(toolset:I=^suncc) ) { + if ( $(toolset:I=_x64) ) + { + ARCH = -m64 ; + } + else + { + ARCH = -m32 ; + } + + LDFLAGS += $(ARCH) ; + rule GetCFlags CONFIG : DEFINES { local RESULT = -D$(DEFINES) ; @@ -380,6 +391,8 @@ else if ( $(toolset:I=^suncc) ) RESULT += -noex ; } + RESULT += $(ARCH) ; + return $(RESULT) ; } diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl index 37cfcb6..4893e27 100644 --- a/tests/autotest-local.pl +++ b/tests/autotest-local.pl @@ -26,7 +26,7 @@ sub gcctoolset }
$fast = (shift eq 'fast');
-@toolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : ($^O =~ /solaris/) ? (suncc) : &gcctoolset();
+@toolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset();
@configurations = (debug, release);
@defines = (PUGIXML_NO_XPATH, PUGIXML_NO_EXCEPTIONS, PUGIXML_NO_STL, PUGIXML_WCHAR_MODE);
$stddefine = 'PUGIXML_STANDARD';
diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl index b685314..3a70b15 100644 --- a/tests/autotest-report.pl +++ b/tests/autotest-report.pl @@ -7,7 +7,7 @@ sub prettysuffix return " C++0x" if ($suffix eq '_0x');
return " x64" if ($suffix eq '_x64');
- return " PowerPC" if ($suffix eq '_ppc');
+ return " PPC" if ($suffix eq '_ppc');
return "";
}
@@ -19,7 +19,7 @@ sub prettytoolset return "Borland C++ 5.82" if ($toolset eq 'bcc');
return "Metrowerks CodeWarrior 8" if ($toolset eq 'cw');
return "Digital Mars C++ 8.51" if ($toolset eq 'dmc');
- return "Sun C++ 5.10" if ($toolset eq 'suncc');
+ return "Sun C++ 5.10" . prettysuffix($1) if ($toolset =~ /^suncc(.*)$/);
return "Intel C++ Compiler $1.0" . prettysuffix($2) if ($toolset =~ /^ic(\d+)(.*)$/);
return "MinGW (GCC $1.$2)" . prettysuffix($3) if ($toolset =~ /^mingw(\d)(\d)(.*)$/);
|