Bug 674647 - Update OS X mozconfig snippets. r=ted.mielczarek.
☠☠ backed out by 4e895b191eb2 ☠ ☠
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Mon, 15 Aug 2011 14:45:37 -0400
changeset 75292 7369baed29efd8bd50c63e4d06b876813864e314
parent 75291 edd7aab15b8b902f77ef4a3910e9a1db5c512404
child 75293 a7911fd8e77950b092aceac887ec6bdd7de53de6
push id1221
push userrespindola@mozilla.com
push dateMon, 15 Aug 2011 18:48:35 +0000
treeherdermozilla-inbound@7369baed29ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs674647
milestone8.0a1
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
Bug 674647 - Update OS X mozconfig snippets. r=ted.mielczarek. Pass --target to configure in mozconfig.leopard. It is needed by the gcc in 10.6. Without this gcc would look for the 10.6 CRT files in the 10.5 SDK and fail. Don't include the kernel version in universal/mozconfig.common for consistency.
build/macosx/mozconfig.leopard
build/macosx/universal/mozconfig.common
--- a/build/macosx/mozconfig.leopard
+++ b/build/macosx/mozconfig.leopard
@@ -5,9 +5,10 @@ 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,20 +33,19 @@
 # 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
 
-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  --target=powerpc-apple-darwin
+ac_add_app_options i386 --target=i386-apple-darwin
+ac_add_app_options x86_64 --target=x86_64-apple-darwin
 
 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.