Bug 1273981 - More tweaks to the OSX mozconfig. a=NPOTB
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 17 Aug 2016 22:29:36 -0400
changeset 340365 832850779bfdfd8863f230963218051167816808
parent 340364 ffe315faba1726473b709697314c13e2da071a62
child 340366 f3e74826733db6303a374c6878871a347a32120a
push id6314
push userryanvm@gmail.com
push dateThu, 18 Aug 2016 02:31:12 +0000
treeherdermozilla-beta@832850779bfd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNPOTB
bugs1273981
milestone49.0
Bug 1273981 - More tweaks to the OSX mozconfig. a=NPOTB
CLOBBER
build/macosx/universal/mozconfig.common
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,8 +18,9 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
 Touch CLOBBER to see if that fixes OSX cross-builds.
+
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -2,23 +2,24 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 mk_add_options MOZ_UNIFY_BDATE=1
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
 
 if test `uname -s` = Linux; then
-  DARWIN_VERSION=
+  ac_add_app_options i386 --target=i386-apple-darwin
+  ac_add_app_options x86_64 --target=x86_64-apple-darwin
 else
   DARWIN_VERSION=`uname -r`
+  ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
+  ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
 fi
 
-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 i386 --with-unify-dist=../x86_64/dist
 ac_add_app_options x86_64 --with-unify-dist=../i386/dist
 
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.7.sdk
 
 . $topsrcdir/build/macosx/mozconfig.common
 
 # $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a