зеркало из https://github.com/mozilla/pjs.git
Bug 614264 - Fix build problem after tracemonkey merge. r=ted.mielczarek
a=bustage
This commit is contained in:
Родитель
403967b09e
Коммит
d7bce3ab68
|
@ -364,7 +364,6 @@ if test "$COMPILE_ENVIRONMENT"; then
|
|||
# different platform than $host, so it would not be used by Mozilla.
|
||||
if test "$target" != "$host"; then
|
||||
echo "cross compiling from $host to $target"
|
||||
CROSS_COMPILE=1
|
||||
|
||||
_SAVE_CC="$CC"
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
|
@ -490,6 +489,12 @@ if test "$target" != "$host"; then
|
|||
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
|
||||
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
|
||||
AC_DEFINE(CROSS_COMPILE)
|
||||
|
||||
dnl If we cross compile for ppc on Mac OS X x86, cross_compiling will
|
||||
dnl have erroneously been set to "no", because the x86 build host is
|
||||
dnl able to run ppc code in a translated environment, making a cross
|
||||
dnl compiler appear native. So we override that here.
|
||||
cross_compiling=yes
|
||||
else
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
|
|
Загрузка…
Ссылка в новой задаче