From 80e79be83397fed968e94e1af1e7394cf1b32fe5 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 11 Feb 2014 10:37:46 +0900
Subject: [PATCH] Bug 462427 - Stop requiring CROSS_COMPILE being set. r=ted

---
 build/autoconf/android.m4               |  1 -
 build/autoconf/toolchain.m4             |  1 +
 build/macosx/universal/mozconfig.common |  5 -----
 build/unix/mozconfig.linux32            |  1 +
 configure.in                            |  6 +-----
 js/src/configure.in                     | 10 ----------
 6 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 13fd38ebc5b8..2e45f6c5e704 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -191,7 +191,6 @@ case "$target" in
     ANDROID_PLATFORM="${android_platform}"
 
     AC_DEFINE(ANDROID)
-    CROSS_COMPILE=1
     AC_SUBST(ANDROID_NDK)
     AC_SUBST(ANDROID_TOOLCHAIN)
     AC_SUBST(ANDROID_PLATFORM)
diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
index 61be183f5127..59d373512a2f 100644
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -134,6 +134,7 @@ AC_CHECK_PROGS(LD, "${target_alias}-ld" "${target}-ld", :)
 AC_CHECK_PROGS(STRIP, "${target_alias}-strip" "${target}-strip", :)
 AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :)
 AC_DEFINE(CROSS_COMPILE)
+CROSS_COMPILE=1
 
 dnl If we cross compile for ppc on Mac OS X x86, cross_compiling will
 dnl dnl have erroneously been set to "no", because the x86 build host is
diff --git a/build/macosx/universal/mozconfig.common b/build/macosx/universal/mozconfig.common
index 8eb0fef58e2e..4c69e3cbeca9 100644
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -43,11 +43,6 @@ if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
   LD=ld
   STRIP="strip"
 
-  # Let configure know that we mean business.
-  if test "$NATIVE_CPU" != "$TARGET_CPU" ; then
-    CROSS_COMPILE=1
-  fi
-
   # Each per-CPU build should be entirely oblivious to the fact that a
   # universal binary will be produced.  The exception is packager.mk, which
   # needs to know to look for universal bits when building the .dmg.
diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32
index 3b8c1e455e14..5198e37683b0 100644
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -5,6 +5,7 @@ if test `uname -m` = "x86_64"; then
   CC="$CC -m32 -march=pentiumpro"
   CXX="$CXX -m32 -march=pentiumpro"
   ac_add_options --target=i686-pc-linux
+  ac_add_options --host=i686-pc-linux
   ac_add_options --x-libraries=/usr/lib
   export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
 fi
diff --git a/configure.in b/configure.in
index 97c78a612190..78128f6a7f50 100644
--- a/configure.in
+++ b/configure.in
@@ -287,7 +287,6 @@ if test -n "$gonkdir" ; then
     AC_SUBST(ANDROID_VERSION)
     AC_DEFINE(HAVE_SYS_UIO_H)
     AC_DEFINE(HAVE_PTHREADS)
-    CROSS_COMPILE=1
     MOZ_CHROME_FILE_FORMAT=omni
     direct_nspr_config=1
 else
@@ -314,16 +313,13 @@ AC_SUBST(OBJCOPY)
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
-dnl Set CROSS_COMPILE in the environment when running configure
-dnl to use the cross-compile setup for now
-dnl ========================================================
 
 dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
 AR_FLAGS='crs $@'
 
 if test "$COMPILE_ENVIRONMENT"; then
 
-if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then
+if test "$target" != "$host"; then
     MOZ_CROSS_COMPILER
 else
     AC_PROG_CC
diff --git a/js/src/configure.in b/js/src/configure.in
index ebe5ee821f7a..dd51b4f4423a 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -228,7 +228,6 @@ if test -n "$gonkdir" ; then
 
     AC_DEFINE(ANDROID)
     AC_DEFINE(GONK)
-    CROSS_COMPILE=1
 else
     MOZ_ANDROID_NDK
 fi
@@ -281,9 +280,6 @@ AC_SUBST(MOZJS_ALPHA)
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
-dnl Set CROSS_COMPILE in the environment when running configure
-dnl to use the cross-compile setup for now
-dnl ========================================================
 
 dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
 AR_FLAGS='crs $@'
@@ -554,12 +550,6 @@ 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, "")