Rename PNaCl

tools/llvm/utman.sh

 #!/bin/bash
 # Copyright (c) 2011 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.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 #
 ######################################################################
 # Directory Layout Description
 ######################################################################
 # All directories are relative to BASE which is
-# currently native_client/toolchain/linux_arm-untrusted
+# On Linux X86-64: native_client/toolchain/pnacl_linux_x86_64/
+# On Linux X86-32: native_client/toolchain/pnacl_linux_i686/
+# On Mac X86-32  : native_client/toolchain/pnacl_darwin_i386/
 #
-# TODO(robertm): arm layout needs to be described
-
 # /x86-32sfi-lib   [experimental] x86 sandboxed libraries and object files
 # /x86-32sfi-tools [experimental] x86-32 crosstool binaries for building
 #                  and linking  x86-32 nexes
 #
 ######################################################################
 # Config
 ######################################################################
 
 set -o nounset
 set -o errexit
@@ skipping 18 matching lines @@
   UTMAN_BUILD_ARM=false
 fi
 
 # TODO(pdox): Decide what the target should really permanently be
 readonly CROSS_TARGET_ARM=arm-none-linux-gnueabi
 readonly CROSS_TARGET_X86_32=i686-none-linux-gnu
 readonly CROSS_TARGET_X86_64=x86_64-none-linux-gnu
 readonly BINUTILS_TARGET=arm-pc-nacl
 readonly REAL_CROSS_TARGET=pnacl
 
-readonly INSTALL_ROOT="$(pwd)/toolchain/linux_arm-untrusted"
+readonly INSTALL_ROOT="$(pwd)/toolchain/pnacl_${BUILD_PLATFORM}_${BUILD_ARCH}"
 readonly INSTALL_BIN="${INSTALL_ROOT}/bin"
 readonly ARM_ARCH=armv7-a
 readonly ARM_FPU=vfp
 readonly INSTALL_DIR="${INSTALL_ROOT}/${CROSS_TARGET_ARM}"
 readonly LDSCRIPTS_DIR="${INSTALL_ROOT}/ldscripts"
 readonly GCC_VER="4.2.1"
 
 # NOTE: NEWLIB_INSTALL_DIR also server as a SYSROOT
 readonly NEWLIB_INSTALL_DIR="${INSTALL_ROOT}/arm-newlib"
 
@@ skipping 460 matching lines @@
     echo "       Please delete it if you don't need it"
     exit -1
   fi
 
   if [ -d "${installdir}" ]; then
     mv "${installdir}" "${tmpdir}"
   fi
 
   download-toolchains
 
-  mv "${installdir}" "${dldir}"
+  if [ -d "${installdir}" ]; then
+    mv "${installdir}" "${dldir}"
+  fi
+
   if [ -d "${tmpdir}" ]; then
     mv "${tmpdir}" "${installdir}"
   fi
 }
 
 #@-------------------------------------------------------------------------
 
 #@ download-toolchains   - Download and Install all SDKs (arm,x86-32,x86-64)
 
 download-toolchains() {
@@ skipping 822 matching lines @@
     # TODO(robertm): revisit some of these options
     RunWithLog arm_sel_ldr \
       ./scons MODE=opt-host \
       platform=arm \
       sdl=none \
       naclsdk_validate=0 \
       sysinfo=0 \
       sel_ldr
     rm -rf  "${INSTALL_ROOT}/tools-arm"
     mkdir "${INSTALL_ROOT}/tools-arm"
-    local sconsdir="scons-out/opt-${BUILD_PLATFORM}-arm"
+    local sconsdir="scons-out/opt-${SCONS_BUILD_PLATFORM}-arm"
     cp "${sconsdir}/obj/src/trusted/service_runtime/sel_ldr" \
        "${INSTALL_ROOT}/tools-arm"
   else
     StepBanner "MISC-ARM" "Skipping ARM sel_ldr (No trusted ARM toolchain)"
   fi
 
   if ${BUILD_PLATFORM_LINUX} ; then
     StepBanner "MISC-ARM" "Building validator (ARM)"
     RunWithLog arm_ncval_core \
       ./scons MODE=opt-host \
@@ skipping 1852 matching lines @@
 [ $# = 0 ] && set -- help  # Avoid reference to undefined $1.
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"