commit 60d24d2c9babe968e939987849cf9f3a039854c3 Author: Erinn Clark <erinn@torproject.org> Date: Sun Mar 27 15:42:54 2011 +0200 add mozconfigs for osx 32- and 64-bit builds --- build-scripts/config/mozconfig-osx-i386 | 32 +++++++++++++++++++++++++++++ build-scripts/config/mozconfig-osx-x86_64 | 27 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 new file mode 100644 index 0000000..231bb9e --- /dev/null +++ b/build-scripts/config/mozconfig-osx-i386 @@ -0,0 +1,32 @@ +CPU=`sysctl -a hw 2>&1 | grep 'hw.availcpu' | sed 's|hw.availcpu = *||'` +let J=$CPU*4 + +# Options for client.mk. +mk_add_options MOZ_MAKE_FLAGS=-j${J} +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options AUTOCONF=autoconf213 + +# Options for cross-compilation on Snow Leopard. +HOST_CC="gcc-4.2 -arch i386" +HOST_CXX="g++-4.2 -arch i386" +CC="gcc-4.2 -arch i386" +CXX="g++-4.2 -arch i386" +RANLIB=ranlib +AR=ar +AS=$CC +LD=ld +STRIP="strip -x -S" +CROSS_COMPILE=1 +ac_add_options --target=i386-apple-darwin$DARWIN_VERSION + +# Options for 'configure' (same as command-line options). +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk +ac_add_options --enable-macos-target=10.5 +ac_add_options --enable-application=browser +ac_add_options --enable-update-packaging +ac_add_options --enable-update-channel=nightly +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --disable-debug +ac_add_options --disable-tests +ac_add_options --disable-crashreporter diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 new file mode 100755 index 0000000..f62f68b --- /dev/null +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -0,0 +1,27 @@ +. $topsrcdir/browser/config/mozconfig + +CC="gcc-4.2 -arch x86_64" +CXX="g++-4.2 -arch x86_64" +HOST_CC="gcc-4.2" +HOST_CXX="g++-4.2" +RANLIB=ranlib +AR=ar +AS=$CC +LD=ld +STRIP="strip -x -S" +CROSS_COMPILE=1 + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' + +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk +ac_add_options --target=x86_64-apple-darwin10.7.0 +ac_add_options --enable-macos-target=10.6 +# bug 491774. crashreporter won't build in cross compile +ac_add_options --disable-crashreporter +ac_add_options --enable-application=browser +ac_add_options --enable-libzul +ac_add_options --enable-optimize +ac_add_options --disable-tests +ac_add_options --disable-debug