Use gcc-4.2 and the 10.5 SDK by default in Gecko 1.9.3. Gecko 1.9.3 builds will no longer run on Mac OS X 10.4. b=501436 r=ted
authorJosh Aas <joshmoz@gmail.com>
Tue, 15 Sep 2009 13:11:24 -0400
changeset 32504 a4e2df0a6af53597afcffd7dbfa2141f9a5e5789
parent 32503 21e5393f648c02e833000a80cf504b86f128dd4a
child 32505 eb15507581d625557a0001359f42d67a53989267
push id9127
push userjosh@mozilla.com
push dateTue, 15 Sep 2009 17:11:49 +0000
treeherdermozilla-central@a4e2df0a6af5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs501436
milestone1.9.3a1pre
Use gcc-4.2 and the 10.5 SDK by default in Gecko 1.9.3. Gecko 1.9.3 builds will no longer run on Mac OS X 10.4. b=501436 r=ted
build/macosx/universal/mozconfig
configure.in
--- a/build/macosx/universal/mozconfig
+++ b/build/macosx/universal/mozconfig
@@ -41,37 +41,37 @@ 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
 
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.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
 if test "$MOZ_BUILD_APP" = "i386" -o  "$MOZ_BUILD_APP" = "ppc"; then
   TARGET_CPU=$MOZ_BUILD_APP
-  GCC_VERSION=4.0
+  GCC_VERSION=4.2
 
   # 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
   # compile.  Always use the 4.0 compiler, since it will always be present and
   # will always work.
-  HOST_CC=gcc-4.0
-  HOST_CXX=g++-4.0
+  HOST_CC=gcc-4.2
+  HOST_CXX=g++-4.2
 
   # These must be set for cross builds, and don't hurt straight builds.
   RANLIB=ranlib
   AR=ar
   AS=$CC
   LD=ld
   STRIP="strip -x -S"
 
--- a/configure.in
+++ b/configure.in
@@ -349,18 +349,18 @@ if test -n "$CROSS_COMPILE" && test "$ta
       powerpc-apple-darwin8*:i?86-apple-darwin*)
         dnl The Darwin cross compiler doesn't necessarily point itself at a
         dnl root that has libraries for the proper architecture, it defaults
         dnl to the system root.  The libraries in the system root on current
         dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
         dnl checks will fail.  Fake a working SDK in that case.
         _SAVE_CFLAGS=$CFLAGS
         _SAVE_CXXFLAGS=$CXXLAGS
-        CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
-        CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
+        CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CFLAGS"
+        CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CXXFLAGS"
         ;;
     esac
 
     AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
     unset ac_cv_prog_CC
     AC_PROG_CC
     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
     unset ac_cv_prog_CXX
@@ -899,17 +899,17 @@ dnl The universal machinery sets UNIVERS
 dnl that a universal binary is being produced.
 AC_SUBST(UNIVERSAL_BINARY)
 
 dnl ========================================================
 dnl Check for MacOS deployment target version
 dnl ========================================================
 
 MOZ_ARG_ENABLE_STRING(macos-target,
-                      [  --enable-macos-target=VER (default=10.4)
+                      [  --enable-macos-target=VER (default=10.5)
                           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