From 0c4a10553e049f3c774f15be162309cb63984402 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 5 Nov 2013 13:03:13 -0500 Subject: [PATCH] Bug 932127 - correctly configure ctypes in cross compilation conditions; r=glandium Just unconditionally export things for Android and everything else. --- js/src/configure.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/js/src/configure.in b/js/src/configure.in index f0a963ad5876..1815b0764e40 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -4300,16 +4300,9 @@ if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then ac_configure_args="$ac_configure_args --with-pic" fi if test "$CROSS_COMPILE"; then - case "$target" in - *-android*|*-linuxandroid*) - export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS + 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\" CC=\"$CC\"" - ;; - esac + ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\"" fi if test "$_MSC_VER"; then # Use a wrapper script for cl and ml that looks more like gcc.