Bug 1273981 - Work around incorrect setting of --target on OSX cross-builds. r=ted, a=NPOTB
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 17 Aug 2016 14:36:36 -0400
changeset 342349 50aa7f83a669ca388d0608857093d1eee6d35e4e
parent 342348 7e23a70d69c13aede04a395e0fb8a4e49a8ab468
child 342350 6cfff98fe1a07527db71b5e83a5ed79b8ee29de5
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, NPOTB
bugs1273981
milestone49.0
Bug 1273981 - Work around incorrect setting of --target on OSX cross-builds. r=ted, a=NPOTB
build/macosx/universal/mozconfig.common
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -1,17 +1,22 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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
 
-DARWIN_VERSION=`uname -r`
+if test `uname -s` = Linux; then
+  DARWIN_VERSION=
+else
+  DARWIN_VERSION=`uname -r`
+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