diff -r f08a0da6b4b6 -r 506985824237 support/buildbot/bootstrap.pl --- a/support/buildbot/bootstrap.pl Tue Apr 26 07:47:12 2011 -0400 +++ b/support/buildbot/bootstrap.pl Sat Apr 30 22:41:54 2011 -0500 @@ -43,14 +43,19 @@ rmtree('OUTPUT'); mkdir('OUTPUT') or die("Failed to create output folder: $!\n"); chdir('OUTPUT'); - my ($result); + my ($result, $argn); + $argn = $#ARGV + 1; print "Attempting to reconfigure...\n"; - if ($^O eq "linux") { - $result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`; - } elsif ($^O eq "darwin") { - $result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`; + if ($argn > 0 && $^O !~ /MSWin/) { + $result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`; } else { - $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; + if ($^O eq "linux") { + $result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`; + } elsif ($^O eq "darwin") { + $result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`; + } else { + $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; + } } print "$result\n"; if ($? != 0) {