From e05bab9b56ca18803e19702b902eb2d2ca2e4099 Mon Sep 17 00:00:00 2001 From: "joshmoz@gmail.com" Date: Tue, 17 Jul 2007 11:10:59 -0700 Subject: [PATCH] use gcc 4 on PPC Mac OS X (we already use gcc 4 on Intel), use 10.4 SDK on all tinderboxes, Mac OS X 10.4 is the new minimum system requirement for Gecko 1.9. b=385221 r=mento r=luser --- build/macosx/universal/mozconfig | 15 ++------------- configure.in | 14 ++------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/build/macosx/universal/mozconfig b/build/macosx/universal/mozconfig index fa1a6cdb5f4..de7fe79d1a2 100644 --- a/build/macosx/universal/mozconfig +++ b/build/macosx/universal/mozconfig @@ -46,25 +46,14 @@ 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 -# ppc builds run on older systems. The minimum SDK for x86 is 10.4u. -ac_add_app_options ppc --with-macos-sdk=/Developer/SDKs/MacOSX10.3.9.sdk -ac_add_app_options i386 --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk # $MOZ_BUILD_APP is only defined when sourced by configure. That's not a # problem, because the variables it affects only need to be set for # configure. if test -n "$MOZ_BUILD_APP" ; then TARGET_CPU=$MOZ_BUILD_APP - - # When compiling C++, Apple gcc 4.0 produces output that requires a minimum - # of 10.3.9. Use 4.0 for the x86 build, which has a higher minimum than - # that. Use 3.3 for ppc, which must run on older systems. This will - # completely override the compiler selected with the gcc_select command. - if test "$TARGET_CPU" = "ppc" ; then - GCC_VERSION=3.3 - else - GCC_VERSION=4.0 - fi + GCC_VERSION=4.0 # It's not strictly necessary to specify -arch during native builds, but it # makes the merged about:buildconfig easier to follow, and it reduces diff --git a/configure.in b/configure.in index 01ec8fe108c..d30c4294baf 100644 --- a/configure.in +++ b/configure.in @@ -3072,7 +3072,7 @@ dnl Check for MacOS deployment target version dnl ======================================================== MOZ_ARG_ENABLE_STRING(macos-target, - [ --enable-macos-target=VER (default=10.3/ppc, 10.4/x86) + [ --enable-macos-target=VER (default=10.4) Set the minimum MacOS version needed at runtime], [_MACOSX_DEPLOYMENT_TARGET=$enableval]) @@ -3085,17 +3085,7 @@ case "$target" in dnl No value specified on the command line or in the environment, dnl use the lesser of the application's minimum or the architecture's dnl minimum. - case "${target_cpu}" in - powerpc*) - dnl Architecture minimum 10.3 - dnl export MACOSX_DEPLOYMENT_TARGET=10.3 - export MACOSX_DEPLOYMENT_TARGET=10.2 - ;; - i*86*) - dnl Architecture minimum 10.4 - export MACOSX_DEPLOYMENT_TARGET=10.4 - ;; - esac + export MACOSX_DEPLOYMENT_TARGET=10.4 fi ;; esac