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
authorjoshmoz@gmail.com
Tue, 17 Jul 2007 11:10:59 -0700
changeset 3567 2bf99941fb6898ac8d49dc0d4696ccd407ce6556
parent 3566 9f97cfae0dbbf6a590b8a32bce41b9216bb0b7cb
child 3568 a08b1f8a375e27a604d2d4c09d5229e6fdee23a1
push idunknown
push userunknown
push dateunknown
reviewersmento, luser
bugs385221
milestone1.9a7pre
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
configure.in
--- a/build/macosx/universal/mozconfig
+++ b/build/macosx/universal/mozconfig
@@ -41,35 +41,24 @@ mk_add_options MOZ_BUILD_PROJECTS="ppc i
 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
 
-# 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
   # conditionalized differences between builds.
   CC="gcc-$GCC_VERSION -arch $TARGET_CPU"
   CXX="g++-$GCC_VERSION -arch $TARGET_CPU"
 
   # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
--- a/configure.in
+++ b/configure.in
@@ -3067,40 +3067,30 @@ then
     LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
 fi
 
 dnl ========================================================
 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])
 
 case "$target" in
 *-darwin*)
     if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
         dnl Use the specified value
         export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
     elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
         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
 
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 
 dnl ========================================================
 dnl See if mmap sees writes