From 9ed3a55adeee95c359ac4091430b41b7d8019921 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 26 May 2014 22:17:58 -0700 Subject: [PATCH] Fix build. --- tools/buildbot/bootstrap.pl | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index c7b5b59bb..75a144891 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -26,8 +26,30 @@ if (!(-f 'OUTPUT/.ambuild2/graph') || !(-f 'OUTPUT/.ambuild2/vars')) { chdir('OUTPUT'); my ($result, $argn); $argn = $#ARGV + 1; + print "Attempting to reconfigure...\n"; -my $conf_args = '--enable-optimize --breakpad-dump --no-color --symbol-files'; + +my @conf_argv = ( + '--enable-optimize', + '--breakpad-dump', + '--no-color', + '--symbol-files' +); + +if ($^O =~ /darwin/) { + push(@conf_argv, '--hl2sdk-root=/Volumes/hgshare'); + push(@conf_argv, '--mms-path=/Users/builds/slaves/common/mmsource-1.10'); + push(@conf_argv, '--mysql-path=/Users/builds/slaves/common/mysql-5.0'); +} elsif ($^O =~ /linux/) { + push(@conf_argv, '--hl2sdk-root=/hgshare'); + push(@conf_argv, '--mms-path=/home/builds/common/mmsource-1.10'); + push(@conf_argv, '--mysql-path=/home/builds/common/mysql-5.0'); +} elsif ($^O =~ /MSWin/) { + push(@conf_argv, '--hl2sdk-root=H:\\'); +} + +my $conf_args = join(' ', @conf_argv); + if ($argn > 0 && $^O !~ /MSWin/) { $result = `CC=$ARGV[0] CXX=$ARGV[0] python ../build/configure.py $conf_args`; } else {