From f09e29fb23658fe956e82039947c201cccd365c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Mon, 15 Aug 2011 14:45:37 -0400 Subject: [PATCH] Bug 674647 - Update OS X mozconfig snippets. r=ted.mielczarek. Pass --target to configure in mozconfig.leopard. It is needed by the gcc in 10.6. Without this gcc would look for the 10.6 CRT files in the 10.5 SDK and fail. Don't include the kernel version in universal/mozconfig.common for consistency. --HG-- extra : rebase_source : 0b8beaa6a6eef94700269218311421fa3031cbc5 --- build/macosx/mozconfig.leopard | 1 + build/macosx/universal/mozconfig.common | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/macosx/mozconfig.leopard b/build/macosx/mozconfig.leopard index 78dfb6f4bb4..97b64e5b4d0 100644 --- a/build/macosx/mozconfig.leopard +++ b/build/macosx/mozconfig.leopard @@ -10,4 +10,5 @@ fi CC="$CC -arch i386" CXX="$CXX -arch i386" +ac_add_options --target=i386-apple-darwin ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk diff --git a/build/macosx/universal/mozconfig.common b/build/macosx/universal/mozconfig.common index c0a123fec23..ff4e3e4e7cc 100644 --- a/build/macosx/universal/mozconfig.common +++ b/build/macosx/universal/mozconfig.common @@ -38,10 +38,9 @@ mk_add_options MOZ_UNIFY_BDATE=1 mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk -DARWIN_VERSION=`uname -r` -ac_add_app_options ppc --target=powerpc-apple-darwin$DARWIN_VERSION -ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION -ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION +ac_add_app_options ppc --target=powerpc-apple-darwin +ac_add_app_options i386 --target=i386-apple-darwin +ac_add_app_options x86_64 --target=x86_64-apple-darwin ac_add_app_options ppc --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk ac_add_app_options i386 --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk