Last checkin was for bug 403250.
This checkin is for bug 403258. 403258 [10.5] When using an SDK, many configure checks fail: ld: library not found for -lcrt1.10.5.o. Set MACOSX_DEPLOYMENT_TARGET before SDK CFLAGS (-isysroot). r=ted.mielczarek a/1.9=dsicore
This commit is contained in:
Родитель
5183252478
Коммит
f4350ccad1
50
configure.in
50
configure.in
|
@ -716,6 +716,31 @@ dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
|
|||
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)
|
||||
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
|
||||
elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
|
||||
dnl No value specified on the command line or in the environment,
|
||||
dnl use the lesser of the application's minimum or the architecture's
|
||||
dnl minimum.
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Mac OS X SDK support
|
||||
dnl ========================================================
|
||||
|
@ -3111,31 +3136,6 @@ then
|
|||
LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl Check for MacOS deployment target version
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_ARG_ENABLE_STRING(macos-target,
|
||||
[ --enable-macos-target=VER (default=10.4)
|
||||
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
|
||||
elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
|
||||
dnl No value specified on the command line or in the environment,
|
||||
dnl use the lesser of the application's minimum or the architecture's
|
||||
dnl minimum.
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
|
||||
|
||||
dnl ========================================================
|
||||
dnl See if mmap sees writes
|
||||
dnl For cross compiling, just define it as no, which is a safe default
|
||||
|
|
Загрузка…
Ссылка в новой задаче