1.1 --- a/tools/buildbot/bootstrap.pl Sun May 01 00:09:25 2011 -0500
1.2 +++ b/tools/buildbot/bootstrap.pl Sun May 01 00:17:11 2011 -0500
1.3 @@ -43,14 +43,19 @@
1.4 rmtree('OUTPUT');
1.5 mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
1.6 chdir('OUTPUT');
1.7 - my ($result);
1.8 + my ($result, $argn);
1.9 + $argn = $#ARGV + 1;
1.10 print "Attempting to reconfigure...\n";
1.11 - if ($^O eq "linux") {
1.12 - $result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
1.13 - } elsif ($^O eq "darwin") {
1.14 - $result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
1.15 + if ($argn > 0 && $^O !~ /MSWin/) {
1.16 + $result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
1.17 } else {
1.18 - $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
1.19 + if ($^O eq "linux") {
1.20 + $result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
1.21 + } elsif ($^O eq "darwin") {
1.22 + $result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
1.23 + } else {
1.24 + $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
1.25 + }
1.26 }
1.27 print "$result\n";
1.28 if ($? != 0) {