[tor-commits] [tor-browser/tor-browser-24.1.1esr-1] correctly configure ctypes in cross compilation conditions

[mikeperry at torproject.org]

commit 824490215a787a0e23854b514e7caa08434b1fdf
Author: Nathan Froyd <froydnj at gmail.com>
Date:   Mon Dec 2 05:12:39 2013 -0800

    correctly configure ctypes in cross compilation conditions
    
    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 4f1f56d..183b9de 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4545,16 +4545,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.