Fixed build scripts for OS X 10.7 build slave.
Fixed build scripts for OS X 10.7 build slave.
1.1 --- a/AMBuildScript Wed Mar 21 21:27:26 2012 -0500
1.2 +++ b/AMBuildScript Wed Mar 21 21:35:07 2012 -0500
1.3 @@ -122,6 +122,9 @@
1.4 self.compiler.AddToListVar('CXXFLAGS', '-fno-threadsafe-statics')
1.5 self.compiler.AddToListVar('CXXFLAGS', '-Wno-non-virtual-dtor')
1.6 self.compiler.AddToListVar('CXXFLAGS', '-Wno-overloaded-virtual')
1.7 + if (self.vendor == 'gcc' and cxx.majorVersion >= 4 and cxx.minorVersion >= 3) or \
1.8 + (self.vendor == 'clang' and cxx.majorVersion >= 3):
1.9 + self.compiler.AddToListVar('CXXFLAGS', '-Wno-delete-non-virtual-dtor')
1.10 self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
1.11 self.compiler.AddToListVar('CDEFINES', 'GNUC')
1.12 if self.vendor == 'gcc':
2.1 --- a/tools/buildbot/bootstrap.pl Wed Mar 21 21:27:26 2012 -0500
2.2 +++ b/tools/buildbot/bootstrap.pl Wed Mar 21 21:35:07 2012 -0500
2.3 @@ -47,12 +47,12 @@
2.4 $argn = $#ARGV + 1;
2.5 print "Attempting to reconfigure...\n";
2.6 if ($argn > 0 && $^O !~ /MSWin/) {
2.7 - $result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
2.8 + $result = `CC=$ARGV[0] CXX=$ARGV[0] python3 ../build/configure.py --enable-optimize`;
2.9 } else {
2.10 if ($^O eq "linux") {
2.11 - $result = `CC=gcc-4.4 CXX=gcc-4.4 python3.1 ../build/configure.py --enable-optimize`;
2.12 + $result = `CC=gcc-4.4 CXX=gcc-4.4 python3 ../build/configure.py --enable-optimize`;
2.13 } elsif ($^O eq "darwin") {
2.14 - $result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
2.15 + $result = `CC=clang CXX=clang python3 ../build/configure.py --enable-optimize`;
2.16 } else {
2.17 $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
2.18 }
3.1 --- a/tools/buildbot/startbuild.pl Wed Mar 21 21:27:26 2012 -0500
3.2 +++ b/tools/buildbot/startbuild.pl Wed Mar 21 21:35:07 2012 -0500
3.3 @@ -11,7 +11,7 @@
3.4 chdir('../../../OUTPUT');
3.5
3.6 if ($^O eq "linux" || $^O eq "darwin") {
3.7 - system("python3.1 build.py 2>&1");
3.8 + system("python3 build.py 2>&1");
3.9 } else {
3.10 system("C:\\Python31\\python.exe build.py 2>&1");
3.11 }