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