Bug 608696 - Properly fix CROSS_COMPILE.
authorPaul Biggar <pbiggar@mozilla.com>
Thu, 18 Nov 2010 10:46:49 -0800
changeset 57897 2e2e864a29593436480c97199a4e762c69d87f55
parent 57896 08d030e87bb7ad6bda6838a8c85aeb4033c29f2c
child 57898 ee499eb8ad11dd8fa15ac434a055421cabe9bd91
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
bugs608696
milestone2.0b8pre
Bug 608696 - Properly fix CROSS_COMPILE.
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -350,17 +350,17 @@ dnl ====================================
 
 dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
 AR_FLAGS='cr $@'
 
 if test "$COMPILE_ENVIRONMENT"; then
 
 if test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
-    cross_compiling=yes
+    CROSS_COMPILE=1
 
     _SAVE_CC="$CC"
     _SAVE_CFLAGS="$CFLAGS"
     _SAVE_LDFLAGS="$LDFLAGS"
 
     AC_MSG_CHECKING([for host c compiler])
     AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc cl icc, "")
     if test -z "$HOST_CC"; then
@@ -910,22 +910,16 @@ if test -n "$_WIN32_MSVC"; then
         # VS2008: http://msdn.microsoft.com/en-us/library/323b6b3k.aspx
         AC_DEFINE(JS_STDDEF_H_HAS_INTPTR_T)
         ;;
     esac
 fi
 
 fi # COMPILE_ENVIRONMENT
 
-if test "$cross_compiling"  = "yes"; then
-    CROSS_COMPILE=1
-else
-    CROSS_COMPILE=
-fi
-
 # Check to see if we are running in a broken QEMU scratchbox.
 # We know that anything below 1.0.16 is broken.
 AC_CHECK_PROGS(SBCONF, sb-conf ve, "")
 if test -n "$SBCONF"; then
     _sb_version=`$SBCONF ve`
     _sb_version_major=`echo $_sb_version | cut -f1 -d.`
     _sb_version_minor=`echo $_sb_version | cut -f2 -d.`
     _sb_version_point=`echo $_sb_version | cut -f3 -d.`