mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-27 21:00:50 +00:00
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.
This commit is contained in:
parent
d719184df5
commit
1a4ff07817
48
configure.in
48
configure.in
@ -420,6 +420,30 @@ 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 ========================================================
|
||||
@ -855,30 +879,6 @@ if test -n "$UNIVERSAL_BINARY"; then
|
||||
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 ========================================================
|
||||
|
Loading…
x
Reference in New Issue
Block a user