From e2eabc7a962154019ba30ec7d16cfb36bda948d7 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 2 Feb 2014 21:26:04 -0700 Subject: [PATCH] Force a reconfigure to happen everytime. --- tools/buildbot/bootstrap.pl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index 82c1f8e6..627a93b7 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -22,25 +22,25 @@ 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"; - my $conf_args = '--enable-optimize --breakpad-dump --no-color'; - if ($argn > 0 && $^O !~ /MSWin/) { - $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`; +} +chdir('OUTPUT'); +my ($result, $argn); +$argn = $#ARGV + 1; +print "Attempting to reconfigure...\n"; +my $conf_args = '--enable-optimize --breakpad-dump --no-color'; +if ($argn > 0 && $^O !~ /MSWin/) { + $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`; +} else { + if ($^O =~ /MSWin/) { + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`; } else { - if ($^O =~ /MSWin/) { - $result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`; - } else { - $result = `CC=clang CXX=clang python ../build/configure.py $conf_args`; - } - } - print "$result\n"; - if ($? != 0) { - die("Could not configure: $!\n"); + $result = `CC=clang CXX=clang python ../build/configure.py $conf_args`; } } +print "$result\n"; +if ($? != 0) { + die("Could not configure: $!\n"); +} sub IsNewer {