From e0ad9f563a4ba88d8908062093a913525ad81fe2 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sat, 17 May 2014 16:11:02 -0500 Subject: [PATCH] Force reconfigures to happen every time. --- support/buildbot/bootstrap.pl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index 19c67d7..daa80d0 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -22,26 +22,26 @@ my $reconf = 0; if (!(-f 'OUTPUT/.ambuild2/graph') || !(-f 'OUTPUT/.ambuild2/vars')) { rmtree('OUTPUT'); mkdir('OUTPUT') or die("Failed to create output folder: $!\n"); - chdir('OUTPUT'); - my ($result, $argn); - $argn = $#ARGV + 1; - print "Attempting to reconfigure...\n"; - if ($argn > 0 && $^O !~ /MSWin/) { - $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`; +} +chdir('OUTPUT'); +my ($result, $argn); +$argn = $#ARGV + 1; +print "Attempting to reconfigure...\n"; +if ($argn > 0 && $^O !~ /MSWin/) { + $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`; +} else { + if ($^O eq "linux") { + $result = `CC=gcc-4.4 CXX="gcc-4.4 -fno-exceptions -fno-rtti" python ../build/configure.py --enable-optimize`; + } elsif ($^O eq "darwin") { + $result = `CC=clang CXX=clang python ../build/configure.py --enable-optimize`; } else { - if ($^O eq "linux") { - $result = `CC=gcc-4.4 CXX="gcc-4.4 -fno-exceptions -fno-rtti" python ../build/configure.py --enable-optimize`; - } elsif ($^O eq "darwin") { - $result = `CC=clang CXX=clang python ../build/configure.py --enable-optimize`; - } else { - $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`; - } - } - print "$result\n"; - if ($? != 0) { - die('Could not configure!'); + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`; } } +print "$result\n"; +if ($? != 0) { + die('Could not configure!'); +} sub IsNewer {