Consistent --host and --build arguments to configure

build_tools/common.sh

 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Environment variable NACL_ARCH should be set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 161 matching lines @@
 if [ -z "${OS_JOBS:-}" ]; then
   if [ "${OS_NAME}" = "Darwin" ]; then
     OS_JOBS=4
   elif [ "${OS_NAME}" = "Linux" ]; then
     OS_JOBS=$(nproc)
   else
     OS_JOBS=1
   fi
 fi
 
+CONF_BUILD=$(/bin/sh "${SCRIPT_DIR}/config.guess")
+CONF_HOST=${NACL_CROSS_PREFIX}
+# TODO(gdeepti): Investigate whether emscripten accurately fits this case for
+# long term usage.
+if [[ ${NACL_ARCH} == pnacl ]]; then
+  # The PNaCl tools use "pnacl-" as the prefix, but config.sub
+  # does not know about "pnacl".  It only knows about "le32-nacl".
+  # Unfortunately, most of the config.subs here are so old that
+  # it doesn't know about that "le32" either.  So we just say "nacl".
+  CONF_HOST="nacl"
+fi
+
 GomaTest() {
   # test the goma compiler
   if [ "${NACL_GOMA_FORCE:-}" = 1 ]; then
     return 0
   fi
   echo 'int foo = 4;' > goma_test.c
   GOMA_USE_LOCAL=false GOMA_FALLBACK=false gomacc "$1" -c \
       goma_test.c -o goma_test.o 2> /dev/null
   local RTN=$?
   rm -f goma_test.c
@@ skipping 782 matching lines @@
     ConfigureStep_Autoconf
   elif IsCMakeProject; then
     ConfigureStep_CMake
   else
     echo "No configure or CMakeLists.txt script found in ${SRC_DIR}"
   fi
 }
 
 
 ConfigureStep_Autoconf() {
-  conf_build=$(/bin/sh "${SCRIPT_DIR}/config.guess")
-
   SetupCrossEnvironment
 
   # Without this autoconf builds will use the same CFLAGS/LDFLAGS for host
   # builds as NaCl builds and not all the flags we use are supported by the
   # host compiler, which could be an older version of gcc
   # (e.g. -fdiagnostics-color=auto).
   export CFLAGS_FOR_BUILD=""
   export LDFLAGS_FOR_BUILD=""
 
-  local conf_host=${NACL_CROSS_PREFIX}
-  # TODO(gdeepti): Investigate whether emscripten accurately fits this case for
-  # long term usage.
-  if [[ ${TOOLCHAIN} == pnacl ]]; then
-    # The PNaCl tools use "pnacl-" as the prefix, but config.sub
-    # does not know about "pnacl".  It only knows about "le32-nacl".
-    # Unfortunately, most of the config.subs here are so old that
-    # it doesn't know about that "le32" either.  So we just say "nacl".
-    conf_host="nacl"
-  fi
-
   # Inject a shim that speed up pnacl invocations for configure.
   if [ "${NACL_ARCH}" = "pnacl" ]; then
     local PNACL_CONF_SHIM="${TOOLS_DIR}/pnacl-configure-shim.py"
     CC="${PNACL_CONF_SHIM} ${CC}"
   fi
 
   if [[ ${TOOLCHAIN} == emscripten ]]; then
     echo "export EMMAKEN_JUST_CONFIGURE=1"
     export EMMAKEN_JUST_CONFIGURE=1
   fi
 
   # Specify both --build and --host options.  This forces autoconf into cross
   # compile mode.  This is useful since the autodection doesn't always works.
   # For example a trivial PNaCl binary can sometimes run on the linux host if
   # it has the correct LLVM bimfmt support. What is more, autoconf will
   # generate a warning if only --host is specified.
   LogExecute "${NACL_CONFIGURE_PATH}" \
-    --build=${conf_build} \
-    --host=${conf_host} \
+    --build=${CONF_BUILD} \
+    --host=${CONF_HOST} \
     --prefix=${PREFIX} \
     --with-http=no \
     --with-html=no \
     --with-ftp=no \
     --${NACL_OPTION}-mmx \
     --${NACL_OPTION}-sse \
     --${NACL_OPTION}-sse2 \
     --${NACL_OPTION}-asm \
     --with-x=no \
     ${EXTRA_CONFIGURE_ARGS:-}
@@ skipping 572 matching lines @@
 ######################################################################
 # Always run
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs