Force reconfigures to happen every time.
Force reconfigures to happen every time.
1.1 --- a/support/buildbot/bootstrap.pl Sun May 11 17:10:10 2014 -0400
1.2 +++ b/support/buildbot/bootstrap.pl Sat May 17 16:11:02 2014 -0500
1.3 @@ -22,25 +22,25 @@
1.4 if (!(-f 'OUTPUT/.ambuild2/graph') || !(-f 'OUTPUT/.ambuild2/vars')) {
1.5 rmtree('OUTPUT');
1.6 mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
1.7 - chdir('OUTPUT');
1.8 - my ($result, $argn);
1.9 - $argn = $#ARGV + 1;
1.10 - print "Attempting to reconfigure...\n";
1.11 - if ($argn > 0 && $^O !~ /MSWin/) {
1.12 - $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`;
1.13 +}
1.14 +chdir('OUTPUT');
1.15 +my ($result, $argn);
1.16 +$argn = $#ARGV + 1;
1.17 +print "Attempting to reconfigure...\n";
1.18 +if ($argn > 0 && $^O !~ /MSWin/) {
1.19 + $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`;
1.20 +} else {
1.21 + if ($^O eq "linux") {
1.22 + $result = `CC=gcc-4.4 CXX="gcc-4.4 -fno-exceptions -fno-rtti" python ../build/configure.py --enable-optimize`;
1.23 + } elsif ($^O eq "darwin") {
1.24 + $result = `CC=clang CXX=clang python ../build/configure.py --enable-optimize`;
1.25 } else {
1.26 - if ($^O eq "linux") {
1.27 - $result = `CC=gcc-4.4 CXX="gcc-4.4 -fno-exceptions -fno-rtti" python ../build/configure.py --enable-optimize`;
1.28 - } elsif ($^O eq "darwin") {
1.29 - $result = `CC=clang CXX=clang python ../build/configure.py --enable-optimize`;
1.30 - } else {
1.31 - $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`;
1.32 - }
1.33 + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`;
1.34 }
1.35 - print "$result\n";
1.36 - if ($? != 0) {
1.37 - die('Could not configure!');
1.38 - }
1.39 +}
1.40 +print "$result\n";
1.41 +if ($? != 0) {
1.42 + die('Could not configure!');
1.43 }
1.44
1.45 sub IsNewer