Remove redundant pnacl translations

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 1182 matching lines @@
 
   if [ "${NACL_ARCH}" = "pnacl" ]; then
     for pexe in ${EXECUTABLES}; do
       FinalizePexe "${pexe}"
     done
     if [ "${TRANSLATE_PEXES:-}" != "no" ]; then
       for pexe in ${EXECUTABLES}; do
         TranslatePexe "${pexe}"
       done
     fi
-    return
   fi
 
   for nexe in ${EXECUTABLES}; do
     Validate "${nexe}"
     # Create a script which will run the executable in sel_ldr.  The name
     # of the script is the same as the name of the executable, either without
     # any extension or with the .sh extension.
+
+    local script_name="${nexe}.sh"
     if [[ ${nexe} == *${NACL_EXEEXT} && ! -d ${nexe%%${NACL_EXEEXT}} ]]; then
-      WriteLauncherScript "${nexe%%${NACL_EXEEXT}}" "$(basename ${nexe})"
-    else
-      WriteLauncherScript "${nexe}.sh" "$(basename ${nexe})"
+      script_name="${nexe%%${NACL_EXEEXT}}"
     fi
+
+    nexe="$(basename ${nexe})"
+    if [[ ${NACL_ARCH} == pnacl ]]; then
+      local basename="${nexe%.*}"
+      nexe=${basename}.x86-64.nexe

[binji, 2016/01/04 19:37:03]

we assume x86_64 host?

+    fi
+    WriteLauncherScript "${script_name}" "${nexe}"
   done
 
   VerifySharedLibraryOrder
 }
 
 
 #
 # Run an executable with under sel_ldr.
 # $1 - Executable (.nexe) name
 #
@@ skipping 116 matching lines @@
   local NEXE=$3
   local SCRIPT=$4
   # Finalize the pexe to make sure it is finalizeable.
   if [ "${PEXE}" -nt "${PEXE_FINAL}" ]; then
     "${PNACLFINALIZE}" "${PEXE}" -o "${PEXE_FINAL}"
   fi
   # Translate to the appropriate version.
   if [ "${PEXE_FINAL}" -nt "${NEXE}" ]; then
     "${TRANSLATOR}" "${PEXE_FINAL}" -arch "${ARCH}" -o "${NEXE}"
   fi
-  WriteLauncherScriptPNaCl "${SCRIPT}" $(basename "${NEXE}") "${ARCH}"
+  WriteLauncherScript "${SCRIPT}" $(basename "${NEXE}")
 }
 
 
-#
-# Write a wrapper script that will run a nexe under sel_ldr, for PNaCl
-# $1 - Script name
-# $2 - Nexe name
-# $3 - sel_ldr architecture
-#
-WriteLauncherScriptPNaCl() {
-  local script_name=$1
-  local nexe_name=$2
-  local arch=$3
-  cat > "${script_name}" <<HERE
-#!/bin/bash
-SCRIPT_DIR=\$(dirname "\${BASH_SOURCE[0]}")
-NACL_SDK_ROOT="${NACL_SDK_ROOT}"
-
-"\${NACL_SDK_ROOT}/tools/sel_ldr.py" -p -- "\${SCRIPT_DIR}/${nexe_name}" "\$@"
-HERE
-  chmod 750 "${script_name}"
-  echo "Wrote script ${PWD}/${script_name}"
-}
-
-
 FinalizePexe() {
   local pexe=$1
   Banner "Finalizing ${pexe}"
   "${PNACLFINALIZE}" "${pexe}"
 }
 
 
 #
 # Translate a PNaCl executable (.pexe) into one or more
 # native NaCl executables (.nexe).
@@ skipping 225 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