backout 7369baed29ef (Bug 674647) due to permaorange on OS X64 opt xpcshell tests
authorDaniel Holbert <dholbert@cs.stanford.edu>
Mon, 15 Aug 2011 21:37:47 -0700
changeset 75354 4e895b191eb29410bb522a90f9496b6c33f2c6ec
parent 75353 1ad8506a40d295eea16c52a0ec5ba65c3ba8bd28
child 75355 5979968b95984225d901c96fd5e61787695f6ea1
push id1246
push userdholbert@mozilla.com
push dateTue, 16 Aug 2011 04:38:03 +0000
treeherdermozilla-inbound@4e895b191eb2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs674647
milestone8.0a1
backs out7369baed29efd8bd50c63e4d06b876813864e314
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout 7369baed29ef (Bug 674647) due to permaorange on OS X64 opt xpcshell tests
build/macosx/mozconfig.leopard
build/macosx/universal/mozconfig.common
--- a/build/macosx/mozconfig.leopard
+++ b/build/macosx/mozconfig.leopard
@@ -5,10 +5,9 @@ fi
 if test -z "$CXX" ; then
    CXX=g++-4.2
 fi
 
 # We do 32 bit builds for leopard
 CC="$CC -arch i386"
 CXX="$CXX -arch i386"
 
-ac_add_options --target=i386-apple-darwin
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -33,19 +33,20 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 mk_add_options MOZ_UNIFY_BDATE=1
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
 
-ac_add_app_options ppc  --target=powerpc-apple-darwin
-ac_add_app_options i386 --target=i386-apple-darwin
-ac_add_app_options x86_64 --target=x86_64-apple-darwin
+DARWIN_VERSION=`uname -r`
+ac_add_app_options ppc  --target=powerpc-apple-darwin$DARWIN_VERSION
+ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
+ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
 
 ac_add_app_options ppc --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_add_app_options i386 --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 ac_add_app_options x86_64 --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
 
 # $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a
 # problem, because the variables it affects only need to be set for
 # configure.