1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/build/macosx/universal/mozconfig.common Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,53 @@
1.4 +# This Source Code Form is subject to the terms of the Mozilla Public
1.5 +# License, v. 2.0. If a copy of the MPL was not distributed with this
1.6 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
1.7 +
1.8 +mk_add_options MOZ_UNIFY_BDATE=1
1.9 +
1.10 +mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
1.11 +
1.12 +DARWIN_VERSION=`uname -r`
1.13 +ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
1.14 +ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
1.15 +ac_add_app_options i386 --with-unify-dist=../x86_64/dist
1.16 +ac_add_app_options x86_64 --with-unify-dist=../i386/dist
1.17 +
1.18 +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
1.19 +
1.20 +. $topsrcdir/build/macosx/mozconfig.common
1.21 +
1.22 +# $MOZ_BUILD_APP is only defined when sourced by configure. That's not a
1.23 +# problem, because the variables it affects only need to be set for
1.24 +# configure.
1.25 +if test -n "$MOZ_BUILD_APP" ; then
1.26 +if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
1.27 + TARGET_CPU=$MOZ_BUILD_APP
1.28 +
1.29 + # $HOST_CXX is presently unused. $HOST_CC will only be used during a cross
1.30 + # compile.
1.31 + HOST_CC=$CC
1.32 + HOST_CXX=$CXX
1.33 +
1.34 + NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
1.35 +
1.36 + # It's not strictly necessary to specify -arch during native builds, but it
1.37 + # makes the merged about:buildconfig easier to follow, and it reduces
1.38 + # conditionalized differences between builds.
1.39 + CC="$CC -arch $TARGET_CPU"
1.40 + CXX="$CXX -arch $TARGET_CPU"
1.41 +
1.42 + # These must be set for cross builds, and don't hurt straight builds.
1.43 + RANLIB=ranlib
1.44 + AR=ar
1.45 + AS=$CC
1.46 + LD=ld
1.47 + STRIP="strip"
1.48 +
1.49 + # Each per-CPU build should be entirely oblivious to the fact that a
1.50 + # universal binary will be produced. The exception is packager.mk, which
1.51 + # needs to know to look for universal bits when building the .dmg.
1.52 + UNIVERSAL_BINARY=1
1.53 +
1.54 + export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP
1.55 +fi
1.56 +fi
