Added arguments to NaCl scons to allow custom toolchain directories.

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 2535 matching lines @@
 
 sdk-headers() {
   sdk-setup "$@"
   mkdir -p "${SDK_INSTALL_INCLUDE}"
 
   local extra_flags=""
   local neutral_platform="x86-32"
 
   StepBanner "SDK" "Install headers"
   spushd "${NACL_ROOT}"
-  # TODO(pnacl-team): remove this pnaclsdk_mode once we have a better story
-  # about host binary type (x86-32 vs x86-64).  SCons only knows how to use
-  # x86-32 host binaries right now, so we need pnaclsdk_mode to override that.
   RunWithLog "sdk.headers" \
       ./scons \
       "${SCONS_ARGS[@]}" \
       ${extra_flags} \
       platform=${neutral_platform} \
-      pnaclsdk_mode="custom:${INSTALL_ROOT}" \
+      pnacl_newlib_dir="${INSTALL_ROOT}" \
       install_headers \
       includedir="$(PosixToSysPath "${SDK_INSTALL_INCLUDE}")"
   spopd
 }
 
 sdk-libs() {
   sdk-setup "$@"
   StepBanner "SDK" "Install libraries"
   mkdir -p "${SDK_INSTALL_LIB}"
 
   local extra_flags=""
   local neutral_platform="x86-32"
 
   spushd "${NACL_ROOT}"
-  # See above TODO about pnaclsdk_mode.
   RunWithLog "sdk.libs.bitcode" \
       ./scons \
       "${SCONS_ARGS[@]}" \
       ${extra_flags} \
       platform=${neutral_platform} \
-      pnaclsdk_mode="custom:${INSTALL_ROOT}" \
+      pnacl_newlib_dir="${INSTALL_ROOT}" \
       install_lib \
       libdir="$(PosixToSysPath "${SDK_INSTALL_LIB}")"
   spopd
 }
 
 # This builds lib*_private.a, to allow building the llc and ld nexes without
 # the IRT and without the segment gap.
 sdk-private-libs() {
   sdk-setup "$@"
   StepBanner "SDK" "Private (non-IRT) libs"
   spushd "${NACL_ROOT}"
 
   local neutral_platform="x86-32"
-  # See above TODO about pnaclsdk_mode.
   RunWithLog "sdk.libs_private.bitcode" \
     ./scons \
     -j${PNACL_CONCURRENCY} \
     bitcode=1 \
     platform=${neutral_platform} \
-    pnaclsdk_mode="custom:${INSTALL_ROOT}" \
+    pnacl_newlib_dir="${INSTALL_ROOT}" \
     --verbose \
     libnacl_sys_private \
     libpthread_private \
     libnacl_dyncode_private \
     libplatform \
     libimc \
     libimc_syscalls \
     libsrpc \
     libgio
 
@@ skipping 738 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
 
 "$@"