Bug 1142006 - Set MACOSX_DEPLOYMENT_TARGET earlier. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 12 Mar 2015 16:28:30 +0900
changeset 233456 efb33ed6f1595b2515bb4d29c7b7cc152906e82f
parent 233455 4b936da89beb3c7bd32117f4d53d9575c22c781d
child 233457 772e07ff4ebab51e84e4f795d7919ab29bf3e677
push id28413
push usercbook@mozilla.com
push dateFri, 13 Mar 2015 13:03:26 +0000
treeherdermozilla-central@9dbb2d41bb2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1142006
milestone39.0a1
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
Bug 1142006 - Set MACOSX_DEPLOYMENT_TARGET earlier. r=mshal On try, where we use sccache, a sccache server is started the first time configure runs the compiler for its checks, and that sccache server is what does compilations on cache misses. But compiling with MACOSX_DEPLOYMENT_TARGET in the environment doesn't have the same effect as without, depending on its value. So MACOSX_DEPLOYMENT_TARGET needs to be set before any compiler invocation.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -416,16 +416,40 @@ if test -n "$MOZ_WINCONSOLE"; then
     AC_DEFINE(MOZ_WINCONSOLE)
 fi
 
 MOZ_TOOL_VARIABLES
 
 MOZ_CHECK_COMPILER_WRAPPER
 
 dnl ========================================================
+dnl Check for MacOS deployment target version
+dnl ========================================================
+
+MOZ_ARG_ENABLE_STRING(macos-target,
+                      [  --enable-macos-target=VER (default=10.6)
+                          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
+    else
+        dnl No value specified on the command line or in the environment,
+        dnl use architecture minimum.
+        export MACOSX_DEPLOYMENT_TARGET=10.6
+    fi
+    ;;
+esac
+
+AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
+
+dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
 
 MOZ_ARG_ENABLE_BOOL(metro,
 [  --enable-metro           Enable Windows Metro build targets],
     MOZ_METRO=1,
     MOZ_METRO=)
 if test -n "$MOZ_METRO"; then
@@ -851,40 +875,16 @@ if test -n "$UNIVERSAL_BINARY"; then
     *)
         UNIFY_DIST="${MOZ_BUILD_ROOT}/${UNIFY_DIST}"
         ;;
     esac
 fi
 AC_SUBST(UNIFY_DIST)
 
 dnl ========================================================
-dnl Check for MacOS deployment target version
-dnl ========================================================
-
-MOZ_ARG_ENABLE_STRING(macos-target,
-                      [  --enable-macos-target=VER (default=10.6)
-                          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
-    else
-        dnl No value specified on the command line or in the environment,
-        dnl use architecture minimum.
-        export MACOSX_DEPLOYMENT_TARGET=10.6
-    fi
-    ;;
-esac
-
-AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
-
-dnl ========================================================
 dnl = Mac OS X SDK support
 dnl ========================================================
 MACOS_SDK_DIR=
 MOZ_ARG_WITH_STRING(macos-sdk,
 [  --with-macos-sdk=dir    Location of platform SDK to use (Mac OS X only)],
     MACOS_SDK_DIR=$withval)
 
 MACOS_PRIVATE_FRAMEWORKS_DIR_DEFAULTED=