retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-3992: --resolve fix OSX platform detection for spidermonkey on 10.7 and later

This commit is contained in:
Michael Jerris 2012-10-29 13:26:26 -04:00
parent 0952a99a76
commit fae4dd51ad
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/js/nsprpub/configure.in
View File

@ -425,7 +425,7 @@ if test "$target" != "$host"; then
LDFLAGS=$_SAVE_LDFLAGS LDFLAGS=$_SAVE_LDFLAGS
case "$build:$target" in 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 The Darwin cross compiler doesn't necessarily point itself at a
dnl root that has libraries for the proper architecture, it defaults dnl root that has libraries for the proper architecture, it defaults
dnl to the system root. The libraries in the system root on current 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 AC_PROG_CXX
case "$build:$target" in 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 Revert the changes made above. From this point on, the target
dnl compiler will never be used without applying the SDK to CFLAGS dnl compiler will never be used without applying the SDK to CFLAGS
dnl (see --with-macos-sdk below). dnl (see --with-macos-sdk below).
@ -496,7 +496,7 @@ fi
rm -f a.out rm -f a.out
case "$build:$target" in 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 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 case, because the x86 build host is able to run ppc code in a
dnl translated environment, making a cross compiler appear native. dnl translated environment, making a cross compiler appear native.
@ -975,7 +975,7 @@ case "$target" in
AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_BSD_FLOCK)
CFLAGS="$CFLAGS -Wmost -fno-common" CFLAGS="$CFLAGS -Wmost -fno-common"
case "${target_cpu}" in case "${target_cpu}" in
i*86*) *86*)
AC_DEFINE(i386) AC_DEFINE(i386)
CPU_ARCH=i386 CPU_ARCH=i386
PR_MD_ASFILES=os_Darwin_x86.s PR_MD_ASFILES=os_Darwin_x86.s
@ -1014,7 +1014,7 @@ case "$target" in
dnl Architecture minimum 10.1 dnl Architecture minimum 10.1
export MACOSX_DEPLOYMENT_TARGET=10.1 export MACOSX_DEPLOYMENT_TARGET=10.1
;; ;;
i*86*) *86*)
dnl Architecture minimum 10.4 dnl Architecture minimum 10.4
export MACOSX_DEPLOYMENT_TARGET=10.4 export MACOSX_DEPLOYMENT_TARGET=10.4
;; ;;