Wed, 31 Dec 2014 07:16:47 +0100
Revert simplistic fix pending revisit of Mozilla integration attempt.
1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
5 mk_add_options MOZ_UNIFY_BDATE=1
7 mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
9 DARWIN_VERSION=`uname -r`
10 ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
11 ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
12 ac_add_app_options i386 --with-unify-dist=../x86_64/dist
13 ac_add_app_options x86_64 --with-unify-dist=../i386/dist
15 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
17 . $topsrcdir/build/macosx/mozconfig.common
19 # $MOZ_BUILD_APP is only defined when sourced by configure. That's not a
20 # problem, because the variables it affects only need to be set for
21 # configure.
22 if test -n "$MOZ_BUILD_APP" ; then
23 if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
24 TARGET_CPU=$MOZ_BUILD_APP
26 # $HOST_CXX is presently unused. $HOST_CC will only be used during a cross
27 # compile.
28 HOST_CC=$CC
29 HOST_CXX=$CXX
31 NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
33 # It's not strictly necessary to specify -arch during native builds, but it
34 # makes the merged about:buildconfig easier to follow, and it reduces
35 # conditionalized differences between builds.
36 CC="$CC -arch $TARGET_CPU"
37 CXX="$CXX -arch $TARGET_CPU"
39 # These must be set for cross builds, and don't hurt straight builds.
40 RANLIB=ranlib
41 AR=ar
42 AS=$CC
43 LD=ld
44 STRIP="strip"
46 # Each per-CPU build should be entirely oblivious to the fact that a
47 # universal binary will be produced. The exception is packager.mk, which
48 # needs to know to look for universal bits when building the .dmg.
49 UNIVERSAL_BINARY=1
51 export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP
52 fi
53 fi