Bug 715397 - ability to build m-c on 10.7 (lion). r=ted.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Wed, 18 Jan 2012 15:35:28 -0500
changeset 84816 429503206f26a72effc1cb8240ad62cafd13dfca
parent 84815 6435f51dd10d6ace3a410d560ed8d92b27ed4ede
child 84817 1d3e470a47095f5bcc91f3f9674896e5fc415c3a
push id21879
push usermak77@bonardo.net
push dateThu, 19 Jan 2012 10:34:58 +0000
treeherdermozilla-central@f76b576a9e28 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs715397
milestone12.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 715397 - ability to build m-c on 10.7 (lion). r=ted. Use the 10.6 sdk.
build/macosx/mozconfig.leopard
build/macosx/universal/mozconfig.common
--- a/build/macosx/mozconfig.leopard
+++ b/build/macosx/mozconfig.leopard
@@ -24,9 +24,9 @@ CXX="$CXX -arch $TARGET_CPU"
 NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
 
 if test "$NATIVE_CPU" != "$TARGET_CPU" ; then
   CROSS_COMPILE=1
 fi
 
 # Note, the version (10) is used by libffi's configure.
 ac_add_options --target=i386-apple-darwin10
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -37,18 +37,17 @@
 mk_add_options MOZ_UNIFY_BDATE=1
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
 
 # Note, the version (10) is used by libffi's configure.
 ac_add_app_options i386 --target=i386-apple-darwin10
 ac_add_app_options x86_64 --target=x86_64-apple-darwin10
 
-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
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
 
 . $topsrcdir/build/macosx/common
 
 # $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.
 if test -n "$MOZ_BUILD_APP" ; then
 if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then