commit 1fce8030e46ebe02716254bf91b3e99bb0249475 Author: Sebastian Hahn sebastian@torproject.org Date: Mon Apr 2 11:32:37 2012 +0200

Update settings for the macx86 builder --- build-scripts/config/mozconfig-osx-i386 | 11 ++++++----- build-scripts/osx.mk | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index e0d2187..6ec8d67 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -3,12 +3,13 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8"

# 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" +HOST_CC="gcc -arch i386" +HOST_CXX="g++ -arch i386" +CC="gcc -arch i386" +CXX="g++ -arch i386" RANLIB=ranlib AR=ar AS=$CC @@ -18,7 +19,7 @@ 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 --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser ac_add_options --enable-official-branding diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a39eb94..7e2c080 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,15 +14,15 @@

## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 BUILD_NUM=8 PLATFORM=MacOS

## Set OSX-specific backwards compatibility options OSX_VERSION=10.5 -CC=CC=gcc-4.0 +CC= # These can probably be left alone for OSX_VERSION 10.5 and up -SDK_PATH=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk +SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk SDK=-sdk $(SDK_PATH) MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION) CF_MIN_VERSION=-isysroot $(SDK_PATH) @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION)

## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=2 +NUM_CORES=4

## Location of directory for source fetching FETCH_DIR=$(PWD)/build