commit 1b56e945bbd5a772f895dd9d3a818f2e606a430d Author: Sebastian Hahn sebastian@torproject.org Date: Mon Apr 30 18:27:44 2012 +0200

OSX: Fix Firefox build to not crash --- build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 6ec8d67..e428a7a 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -6,8 +6,8 @@ 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 -arch i386" -HOST_CXX="g++ -arch i386" +HOST_CC="clang -arch i386" +HOST_CXX="clang++ -arch i386" CC="gcc -arch i386" CXX="g++ -arch i386" RANLIB=ranlib @@ -28,3 +28,6 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index d4857b6..b0d1a52 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig

-CC="gcc -arch x86_64" -CXX="g++ -arch x86_64" +CC="clang -arch x86_64" +CXX="clang++ -arch x86_64" HOST_CC="gcc" HOST_CXX="g++" RANLIB=ranlib @@ -19,7 +19,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1

ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk -ac_add_options --target=x86_64-apple-darwin10.7.0 +ac_add_options --target=x86_64-apple-darwin10.6.0 ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter @@ -30,3 +30,6 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type"