Set MACOSX_DEPLOYMENT_TARGET properly per-architecture. Stop incorrectly targeting Mac OS X 10.5 for 64-bit builds by default. b=583318 r=ted a=blocking-final+
authorJosh Aas <joshmoz@gmail.com>
Fri, 20 Aug 2010 18:10:15 -0400
changeset 51143 9f193e1683ee662d09f0397e9cb08e1896580d2d
parent 51142 4d5b0a8216a7680c2533e83cda60e9259e16877d
child 51144 4cf06104570ae4b95779e6fce3bf20c4105d5e8b
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, blocking-final
bugs583318
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Set MACOSX_DEPLOYMENT_TARGET properly per-architecture. Stop incorrectly targeting Mac OS X 10.5 for 64-bit builds by default. b=583318 r=ted a=blocking-final+
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1083,20 +1083,30 @@ MOZ_ARG_ENABLE_STRING(macos-target,
                       [_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
         AC_DEFINE_UNQUOTED(__ENVIRONMENT_MAC_OS_X_VERION_MIN_REQUIRED__,$_MACOSX_DEPLOYMENT_TARGET)
-    elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
+    else
         dnl No value specified on the command line or in the environment,
         dnl use architecture minimum.
-        export MACOSX_DEPLOYMENT_TARGET=10.5
+        case "${target_cpu}" in
+          ppc*)
+            export MACOSX_DEPLOYMENT_TARGET=10.5
+            ;;
+          i*86)
+            export MACOSX_DEPLOYMENT_TARGET=10.5
+            ;;
+          x86_64)
+            export MACOSX_DEPLOYMENT_TARGET=10.6
+            ;;
+        esac
     fi
     ;;
 esac
 
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 
 dnl ========================================================
 dnl = Mac OS X SDK support