Bug 932127 - correctly configure ctypes in cross compilation conditions; r=glandium

Just unconditionally export things for Android and everything else.
This commit is contained in:
Nathan Froyd 2013-11-05 13:03:13 -05:00
Родитель 9ff28f4f25
Коммит 0c4a10553e
1 изменённых файлов: 2 добавлений и 9 удалений

Просмотреть файл

@ -4300,16 +4300,9 @@ if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
ac_configure_args="$ac_configure_args --with-pic" ac_configure_args="$ac_configure_args --with-pic"
fi fi
if test "$CROSS_COMPILE"; then if test "$CROSS_COMPILE"; then
case "$target" in export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS
*-android*|*-linuxandroid*)
export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS
ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\"" ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\""
;;
*)
ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\" CC=\"$CC\""
;;
esac
fi fi
if test "$_MSC_VER"; then if test "$_MSC_VER"; then
# Use a wrapper script for cl and ml that looks more like gcc. # Use a wrapper script for cl and ml that looks more like gcc.