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

This commit is contained in:
Josh Aas 2009-09-15 13:11:24 -04:00
Родитель fe0c8cd2d4
Коммит 8ebbb5dc03
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -46,7 +46,7 @@ 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
@ -54,7 +54,7 @@ ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
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
@ -65,8 +65,8 @@ if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "ppc"; then
# $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

Просмотреть файл

@ -354,8 +354,8 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
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
@ -904,7 +904,7 @@ 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])