Bug 799093 - Avoid mac builds being considered as cross compiled by jemalloc configure. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 17 Oct 2012 16:30:05 +0200
changeset 110540 0fea15c742aaac371e70f995218ca1054322c875
parent 110539 bc2385c28209fef74831df072c10098625794cd8
child 110541 17ee39da56c8f8600ab8c1528b36a2bcf66c3f7d
push id23700
push userryanvm@gmail.com
push dateThu, 18 Oct 2012 02:10:26 +0000
treeherdermozilla-central@5142bbd4da12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs799093
milestone19.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 799093 - Avoid mac builds being considered as cross compiled by jemalloc configure. r=ted
build/macosx/universal/mozconfig.common
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -1,19 +1,19 @@
 # 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
 
-# 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
+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
 
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
 
 . $topsrcdir/build/macosx/mozconfig.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.