1.1 --- a/support/buildbot/bootstrap.pl Sat May 17 16:11:02 2014 -0500
1.2 +++ b/support/buildbot/bootstrap.pl Sat May 17 16:19:00 2014 -0500
1.3 @@ -27,20 +27,19 @@
1.4 my ($result, $argn);
1.5 $argn = $#ARGV + 1;
1.6 print "Attempting to reconfigure...\n";
1.7 +my $conf_args = '--enable-optimize --no-color --symbol-files';
1.8 if ($argn > 0 && $^O !~ /MSWin/) {
1.9 - $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`;
1.10 + $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`;
1.11 } else {
1.12 - if ($^O eq "linux") {
1.13 - $result = `CC=gcc-4.4 CXX="gcc-4.4 -fno-exceptions -fno-rtti" python ../build/configure.py --enable-optimize`;
1.14 - } elsif ($^O eq "darwin") {
1.15 - $result = `CC=clang CXX=clang python ../build/configure.py --enable-optimize`;
1.16 + if ($^O =~ /MSWin/) {
1.17 + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`;
1.18 } else {
1.19 - $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`;
1.20 + $result = `CC=clang CXX=clang python ../build/configure.py $conf_args`;
1.21 }
1.22 }
1.23 print "$result\n";
1.24 if ($? != 0) {
1.25 - die('Could not configure!');
1.26 + die("Could not configure: $!\n");
1.27 }
1.28
1.29 sub IsNewer