From 1d7f90adc17e5b2d99cb4274863ca0a88400fc20 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sat, 17 May 2014 16:22:34 -0500 Subject: [PATCH] Sync changes from SourceMod's bootstrap script. --- support/buildbot/bootstrap.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl index daa80d0..3727379 100755 --- a/support/buildbot/bootstrap.pl +++ b/support/buildbot/bootstrap.pl @@ -27,20 +27,19 @@ chdir('OUTPUT'); my ($result, $argn); $argn = $#ARGV + 1; print "Attempting to reconfigure...\n"; +my $conf_args = '--enable-optimize --no-color --symbol-files'; if ($argn > 0 && $^O !~ /MSWin/) { - $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py --enable-optimize`; + $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`; } 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`; + if ($^O =~ /MSWin/) { + $result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`; } else { - $result = `C:\\Python27\\Python.exe ..\\build\\configure.py --enable-optimize`; + $result = `CC=clang CXX=clang python ../build/configure.py $conf_args`; } } print "$result\n"; if ($? != 0) { - die('Could not configure!'); + die("Could not configure: $!\n"); } sub IsNewer