1.1 --- a/tools/buildbot/bootstrap.pl	Sun Feb 02 15:54:24 2014 -0700
     1.2 +++ b/tools/buildbot/bootstrap.pl	Sun Feb 02 21:26:04 2014 -0700
     1.3 @@ -22,24 +22,24 @@
     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 -	my $conf_args = '--enable-optimize --breakpad-dump --no-color';
    1.12 -	if ($argn > 0 && $^O !~ /MSWin/) {
    1.13 -		$result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`;
    1.14 +}
    1.15 +chdir('OUTPUT');
    1.16 +my ($result, $argn);
    1.17 +$argn = $#ARGV + 1;
    1.18 +print "Attempting to reconfigure...\n";
    1.19 +my $conf_args = '--enable-optimize --breakpad-dump --no-color';
    1.20 +if ($argn > 0 && $^O !~ /MSWin/) {
    1.21 +	$result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`;
    1.22 +} else {
    1.23 +	if ($^O =~ /MSWin/) {
    1.24 +		$result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`;
    1.25  	} else {
    1.26 -		if ($^O =~ /MSWin/) {
    1.27 -			$result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`;
    1.28 -		} else {
    1.29 -			$result = `CC=clang CXX=clang python ../build/configure.py $conf_args`;
    1.30 -		}
    1.31 +		$result = `CC=clang CXX=clang python ../build/configure.py $conf_args`;
    1.32  	}
    1.33 -	print "$result\n";
    1.34 -	if ($? != 0) {
    1.35 -		die("Could not configure: $!\n");
    1.36 -	}
    1.37 +}
    1.38 +print "$result\n";
    1.39 +if ($? != 0) {
    1.40 +	die("Could not configure: $!\n");
    1.41  }
    1.42  
    1.43  sub IsNewer