Skip to content

Commit

Permalink
Force reconfigures to happen every time.
Browse files Browse the repository at this point in the history
  • Loading branch information
TheDS committed May 17, 2014
1 parent 39d8d71 commit 4cafc62
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions support/buildbot/bootstrap.pl
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
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
{
Expand Down

0 comments on commit 4cafc62

Please sign in to comment.