Switch PNaCl lib, include, and translator directories for new layout

pnacl/build.sh

 #!/bin/bash
 # 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.
 #
 #@                 PNaCl toolchain build script
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 ######################################################################
@@ skipping 114 matching lines @@
 
 # PNaCl toolchain installation directories (absolute paths)
 readonly INSTALL_ROOT="${TOOLCHAIN_BASE}/pnacl_newlib"
 readonly INSTALL_BIN="${INSTALL_ROOT}/bin"
 
 # Bitcode lib directories (including static bitcode libs)
 INSTALL_LIB="${INSTALL_ROOT}/lib"
 
 # Native nacl lib directories
 # The pattern `${INSTALL_LIB_NATIVE}${arch}' is used in many places.
-readonly INSTALL_LIB_NATIVE="${INSTALL_ROOT}/lib-"
-readonly INSTALL_LIB_ARM="${INSTALL_LIB_NATIVE}arm"
-readonly INSTALL_LIB_X8632="${INSTALL_LIB_NATIVE}x86-32"
-readonly INSTALL_LIB_X8664="${INSTALL_LIB_NATIVE}x86-64"
-readonly INSTALL_LIB_MIPS32="${INSTALL_LIB_NATIVE}mips32"
+readonly INSTALL_LIB_NATIVE="${INSTALL_ROOT}/translator/"
+readonly INSTALL_LIB_ARM="${INSTALL_LIB_NATIVE}arm/lib"
+readonly INSTALL_LIB_X8632="${INSTALL_LIB_NATIVE}x86-32/lib"
+readonly INSTALL_LIB_X8664="${INSTALL_LIB_NATIVE}x86-64/lib"
+readonly INSTALL_LIB_MIPS32="${INSTALL_LIB_NATIVE}mips32/lib"
 
 # PNaCl client-translators (sandboxed) binary locations
 readonly INSTALL_TRANSLATOR="${TOOLCHAIN_BASE}/pnacl_translator"
 
 
 # The INSTALL_HOST directory has host binaries and libs which
 # are part of the toolchain (e.g. llvm and binutils).
 # There are also tools-x86 and tools-arm which have host binaries which
 # are not part of the toolchain but might be useful in the SDK, e.g.
 # arm sel_ldr and x86-hosted arm/mips validators.
@@ skipping 401 matching lines @@
     llvm-sb universal
     binutils-gold-sb universal
     if ${PNACL_PRUNE}; then
       # The universal pexes have already been translated.
       # They don't need to stick around.
       rm -rf "$(GetTranslatorInstallDir universal)"
     fi
   fi
 
   # Copy native libs to translator install dir.
-  cp -a ${INSTALL_LIB_NATIVE}* ${INSTALL_TRANSLATOR}
+  mkdir -p ${INSTALL_TRANSLATOR}/translator
+  cp -a ${INSTALL_LIB_NATIVE}* ${INSTALL_TRANSLATOR}/translator
 
   driver-install-translator
 
   if ${PNACL_PRUNE}; then
     sdk-clean newlib
   fi
 }
 
 
 #+ translator-prune    Remove leftover files like pexes from pnacl_translator
@@ skipping 1407 matching lines @@
     fi
   done
 }
 
 GetTranslatorBuildDir() {
   local arch="$1"
   echo "${TC_BUILD}/translator-${arch//_/-}"
 }
 
 GetTranslatorInstallDir() {
-  local arch="$1"
-  echo "${INSTALL_TRANSLATOR}"/${arch}
+  local arch
+  case $1 in
+    i686) arch=x86-32 ;;
+    x86_64) arch=x86-64 ;;
+    armv7) arch=arm ;;
+    default) arch=$1 ;;
+  esac
+  echo "${INSTALL_TRANSLATOR}"/translator/${arch}
 }
 
 ### Sandboxed version of gold.
 
 #+-------------------------------------------------------------------------
 #+ binutils-gold-sb - Build and install gold (sandboxed)
 #+                    This is the replacement for the old
 #+                    final sandboxed linker which was bfd based.
 #+                    It has nothing to do with the bitcode linker
 #+                    which is also gold based.
@@ skipping 1367 matching lines @@
 
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"