Added arguments to NaCl scons to allow custom toolchain directories.

tools/Makefile

 # 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.
 
 ##############################################################################
 # Helper script for NaCl toolchain development workflow.
 #
 # Buildbots:
 # - Sync needed sources at pinned revision and build newlib-based toolchain:
 #     make buildbot-build-with-newlib TOOLCHAINLOC=<where-to-install-the-toolchain>
@@ skipping 849 matching lines @@
 .PHONY: gdb
 gdb: BUILD/stamp-$(CROSSARCH)-gdb
 
 
 ##################################################################
 # Install headers from the NaCl tree locally for the gcc build to see.
 ##################################################################
 .PHONY: headers_for_build
 headers_for_build:
         cd .. && \
-          ./$(SCONS) naclsdk_mode=custom:$(PREFIX_NATIVE) \
+          ./$(SCONS) nacl_newlib_dir=$(PREFIX_NATIVE) \
                      --verbose platform=x86-$(BITSPLATFORM) \
                      install_headers includedir=$(HEADERS_FOR_BUILD_NATIVE)
 
 HEADERS_FOR_BUILD = \
         $(abspath $(dir $(THISMAKEFILE)))/BUILD/headers_for_build
 
 ifeq ($(PLATFORM), win)
   HEADERS_FOR_BUILD_NATIVE = `cygpath -m $(HEADERS_FOR_BUILD)`
 else
   HEADERS_FOR_BUILD_NATIVE = $(HEADERS_FOR_BUILD)
@@ skipping 165 matching lines @@
 ##################################################################
 # Run DejaGnu tests.
 ##################################################################
 
 SEL_LDR = $(abspath ../scons-out/opt-$(PLATFORM)-x86-$(BITSPLATFORM)/staging/sel_ldr)
 DEJAGNU_TIMESTAMP := $(shell date +%y%m%d%H%M%S)
 
 .PHONY: $(SEL_LDR)
 $(SEL_LDR):
         (cd .. && \
-          ./$(SCONS) naclsdk_mode=custom:$(DESTDIR)$(PREFIX) \
+          ./$(SCONS) nacl_glibc_dir=$(DESTDIR)$(PREFIX) \
             --mode=opt-host,nacl platform=x86-$(BITSPLATFORM) \
             --verbose sel_ldr)
 
 .PHONY: check
 check: $(SEL_LDR)
         (cd .. && \
-          ./$(SCONS) naclsdk_mode=custom:$(DESTDIR)$(PREFIX) \
+          ./$(SCONS) nacl_glibc_dir=$(DESTDIR)$(PREFIX) \
             --mode=opt-host,nacl platform=x86-$(BITSPLATFORM) \
             --verbose run_hello_world_test)
         mkdir BUILD/build-gcc-$(CROSSARCH)/results.$(DEJAGNU_TIMESTAMP)
         $(MAKE) \
             -C BUILD/build-gcc-$(CROSSARCH) \
             DEJAGNU=$(abspath dejagnu/site.exp) \
             RUNTESTFLAGS=" \
                 --target_board=nacl \
                 --outdir=$(abspath BUILD/build-gcc-$(CROSSARCH)/results.$(DEJAGNU_TIMESTAMP)) \
                 SIM=$(SEL_LDR)" \
@@ skipping 35 matching lines @@
 
 
 ##################################################################
 # Remove the BUILD directory.
 # Library builds are maintained by scons.
 ##################################################################
 
 .PHONY: clean
 clean:
         rm -rf BUILD/*