Add emscripten support to config.sub

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 867 matching lines @@
   # Replace the package's config.sub one with an up-do-date copy
   # that includes nacl support.  We only do this if the string
   # 'nacl)' is not already contained in the file.
   CONFIG_SUB=${CONFIG_SUB:-config.sub}
   if [ ! -f "${CONFIG_SUB}" ]; then
     CONFIG_SUB=$(find "${SRC_DIR}" -name config.sub -print)
   fi
 
   for sub in ${CONFIG_SUB}; do
     if grep -q 'nacl)' "${sub}" /dev/null; then
-      echo "${CONFIG_SUB} supports NaCl"
-    else
-      echo "Patching ${sub}"
-      /bin/cp -f "${TOOLS_DIR}/config.sub" "${sub}"
+      if grep -q 'emscripten)' "${sub}" /dev/null; then
+        echo "${CONFIG_SUB} supports NaCl + emscripten"
+        continue
+      fi
     fi
+    echo "Patching ${sub}"
+    /bin/cp -f "${TOOLS_DIR}/config.sub" "${sub}"
   done
 }
 
 
 PatchConfigure() {
   if [ -f configure ]; then
     Banner "Patching configure"
     "${TOOLS_DIR}/patch_configure.py" configure
   fi
 }
@@ skipping 61 matching lines @@
   # 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 [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "emscripten" ]; then
+  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"
@@ skipping 241 matching lines @@
   fi
 }
 
 
 #
 # Write a wrapper script that will run a nexe under sel_ldr
 # $1 - Script name
 # $2 - Nexe name
 #
 WriteLauncherScript() {
+  local script=$1
+  local binary=$2
   if [ "${SKIP_SEL_LDR_TESTS}" = "1" ]; then
     return
   fi
 
+  if [[ ! -f $binary ]]; then
+    echo "error: missing binary: ${binary}"
+    exit 1
+  fi
+
   if [ "${TOOLCHAIN}" = "emscripten" ]; then
     local node=node
     if ! which node > /dev/null ; then
       node=nodejs
       if ! which nodejs > /dev/null ; then
         echo "Failed to find 'node' or 'nodejs' in PATH"
         exit 1
       fi
     fi
-    cat > "$1" <<HERE
+    cat > "$script" <<HERE
 #!/bin/bash
 
 SCRIPT_DIR=\$(dirname "\${BASH_SOURCE[0]}")
 NODE=${node}
 
 cd "\${SCRIPT_DIR}"
-exec \${NODE} $2 "\$@"
+exec \${NODE} $binary "\$@"
 HERE
-    chmod 750 "$1"
-    echo "Wrote script $1 -> $2"
+    chmod 750 "$script"
+    echo "Wrote script $script -> $binary"
     return
   fi
 
   if [ "${OS_NAME}" = "Cygwin" ]; then
     local LOGFILE=nul
   else
     local LOGFILE=/dev/null
   fi
 
   if [ "${NACL_LIBC}" = "glibc" ]; then
-    cat > "$1" <<HERE
+    cat > "$script" <<HERE
 #!/bin/bash
 SCRIPT_DIR=\$(dirname "\${BASH_SOURCE[0]}")
 if [ \$(uname -s) = CYGWIN* ]; then
   SCRIPT_DIR=\$(cygpath -m \${SCRIPT_DIR})
 fi
 NACL_SDK_ROOT=${NACL_SDK_ROOT}
 
 NACL_SDK_LIB=${NACL_SDK_LIB}
 LIB_PATH_DEFAULT=${NACL_SDK_LIBDIR}:${NACLPORTS_LIBDIR}
 LIB_PATH_DEFAULT=\${LIB_PATH_DEFAULT}:\${NACL_SDK_LIB}:\${SCRIPT_DIR}
 SEL_LDR_LIB_PATH=\${SEL_LDR_LIB_PATH}:\${LIB_PATH_DEFAULT}
 
 "\${NACL_SDK_ROOT}/tools/sel_ldr.py" -p --library-path "\${SEL_LDR_LIB_PATH}" \
-    -- "\${SCRIPT_DIR}/$2" "\$@"
+    -- "\${SCRIPT_DIR}/$binary" "\$@"
 HERE
   else
-    cat > "$1" <<HERE
+    cat > "$script" <<HERE
 #!/bin/bash
 SCRIPT_DIR=\$(dirname "\${BASH_SOURCE[0]}")
 if [ \$(uname -s) = CYGWIN* ]; then
   SCRIPT_DIR=\$(cygpath -m \${SCRIPT_DIR})
 fi
 NACL_SDK_ROOT=${NACL_SDK_ROOT}
 
-"\${NACL_SDK_ROOT}/tools/sel_ldr.py" -p -- "\${SCRIPT_DIR}/$2" "\$@"
+"\${NACL_SDK_ROOT}/tools/sel_ldr.py" -p -- "\${SCRIPT_DIR}/$binary" "\$@"
 HERE
   fi
 
-  chmod 750 "$1"
-  echo "Wrote script $1 -> $2"
+  chmod 750 "$script"
+  echo "Wrote script $script -> $binary"
 }
 
 
 TranslateAndWriteLauncherScript() {
   local PEXE=$1
   local PEXE_FINAL=$1_final.pexe
   local ARCH=$2
   local NEXE=$3
   local SCRIPT=$4
   # Finalize the pexe to make sure it is finalizeable.
@@ skipping 257 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