From 699de95eb7ede3ce35169a09d235ef1d18d7c3dc Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Sat, 30 Apr 2011 22:41:54 -0500
Subject: [PATCH] Updated buildbot scripts to support clang builders (bug 4897,
 r=dvander).

---
 AMBuildScript                 |  2 ++
 support/buildbot/bootstrap.pl | 17 +++++++++++------
 support/buildbot/package.pl   |  8 +++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 7d3e8df..4fe86cf 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -100,6 +100,8 @@ class MMS:
 				self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
 				if self.vendor == 'gcc':
 					self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
+				else:
+					self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
 			elif isinstance(cxx, Cpp.MSVC):
 				self.vendor = 'msvc'
 				if AMBuild.options.debug == '1':
diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl
index 87f699b..8442ac1 100755
--- a/support/buildbot/bootstrap.pl
+++ b/support/buildbot/bootstrap.pl
@@ -43,14 +43,19 @@ if ($reconf) {
 	rmtree('OUTPUT');
 	mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
 	chdir('OUTPUT');
-	my ($result);
+	my ($result, $argn);
+	$argn = $#ARGV + 1;
 	print "Attempting to reconfigure...\n";
-	if ($^O eq "linux") {
-		$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
-	} elsif ($^O eq "darwin") {
-		$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
+	if ($argn > 0 && $^O !~ /MSWin/) {
+		$result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
 	} else {
-		$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
+		if ($^O eq "linux") {
+			$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
+		} elsif ($^O eq "darwin") {
+			$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
+		} else {
+			$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
+		}
 	}
 	print "$result\n";
 	if ($? != 0) {
diff --git a/support/buildbot/package.pl b/support/buildbot/package.pl
index a6a0a97..b21be5c 100755
--- a/support/buildbot/package.pl
+++ b/support/buildbot/package.pl
@@ -5,9 +5,10 @@ use Cwd;
 use File::Basename;
 use Net::FTP;
 
-my ($ftp_file, $ftp_host, $ftp_user, $ftp_pass, $ftp_path);
+my ($ftp_file, $ftp_host, $ftp_user, $ftp_pass, $ftp_path, $tag);
 
 $ftp_file = shift;
+$tag = shift;
 
 open(FTP, $ftp_file) or die "Unable to read FTP config file $ftp_file: $!\n";
 $ftp_host = <FTP>;
@@ -49,6 +50,11 @@ else
     $version .= '-' . $^O;
 }
 
+if (defined $tag)
+{
+    $version .= '-' . $tag;
+}
+
 my ($filename);
 $filename = 'mmsource-' . $version;
 if ($^O eq "linux")