FS-3992: --resolve fix OSX platform detection for spidermonkey on 10.7 and later
This commit is contained in:
parent
0952a99a76
commit
fae4dd51ad
|
@ -425,7 +425,7 @@ if test "$target" != "$host"; then
|
|||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
|
||||
case "$build:$target" in
|
||||
powerpc-apple-darwin8*:i?86-apple-darwin*)
|
||||
powerpc-apple-darwin8*:*86-apple-darwin*)
|
||||
dnl The Darwin cross compiler doesn't necessarily point itself at a
|
||||
dnl root that has libraries for the proper architecture, it defaults
|
||||
dnl to the system root. The libraries in the system root on current
|
||||
|
@ -446,7 +446,7 @@ if test "$target" != "$host"; then
|
|||
AC_PROG_CXX
|
||||
|
||||
case "$build:$target" in
|
||||
powerpc-apple-darwin8*:i?86-apple-darwin*)
|
||||
powerpc-apple-darwin8*:*86-apple-darwin*)
|
||||
dnl Revert the changes made above. From this point on, the target
|
||||
dnl compiler will never be used without applying the SDK to CFLAGS
|
||||
dnl (see --with-macos-sdk below).
|
||||
|
@ -496,7 +496,7 @@ fi
|
|||
rm -f a.out
|
||||
|
||||
case "$build:$target" in
|
||||
i?86-apple-darwin*:powerpc-apple-darwin*)
|
||||
*86-apple-darwin*:powerpc-apple-darwin*)
|
||||
dnl cross_compiling will have erroneously been set to "no" in this
|
||||
dnl case, because the x86 build host is able to run ppc code in a
|
||||
dnl translated environment, making a cross compiler appear native.
|
||||
|
@ -975,7 +975,7 @@ case "$target" in
|
|||
AC_DEFINE(HAVE_BSD_FLOCK)
|
||||
CFLAGS="$CFLAGS -Wmost -fno-common"
|
||||
case "${target_cpu}" in
|
||||
i*86*)
|
||||
*86*)
|
||||
AC_DEFINE(i386)
|
||||
CPU_ARCH=i386
|
||||
PR_MD_ASFILES=os_Darwin_x86.s
|
||||
|
@ -1014,7 +1014,7 @@ case "$target" in
|
|||
dnl Architecture minimum 10.1
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.1
|
||||
;;
|
||||
i*86*)
|
||||
*86*)
|
||||
dnl Architecture minimum 10.4
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
;;
|
||||
|
|
Loading…
Reference in New Issue