Use new toolchain_args variable in GN

build/toolchain/nacl/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/sysroot.gni")
 import("//build/config/nacl/config.gni")
 import("//build/toolchain/nacl_toolchain.gni")
 
 # Add the toolchain revision as a preprocessor define so that sources are
 # rebuilt when a toolchain is updated.
@@ skipping 45 matching lines @@
   # by being given the scriptprefix.
   if (host_os == "win" && !use_goma && cc_wrapper == "") {
     compiler_scriptprefix = scriptprefix
   } else {
     compiler_scriptprefix = ""
   }
 
   nacl_toolchain(target_name) {
     toolchain_package = "pnacl_newlib"
     toolchain_revision = pnacl_newlib_rev
-    toolchain_cpu = "pnacl"
     toolprefix =
         rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/pnacl-",
                     root_build_dir)
 
-    is_clang = true
     cc = compiler_scriptprefix + toolprefix + "clang" + scriptsuffix
     cxx = compiler_scriptprefix + toolprefix + "clang++" + scriptsuffix
     ar = scriptprefix + toolprefix + "ar" + scriptsuffix
     readelf = scriptprefix + toolprefix + "readelf" + scriptsuffix
     nm = scriptprefix + toolprefix + "nm" + scriptsuffix
     if (defined(invoker.strip)) {
       strip = scriptprefix + toolprefix + invoker.strip + scriptsuffix
     }
 
     # Note this is not the usual "ld = cxx" because "ld" uses are
     # never run via goma, so this needs scriptprefix.
     ld = scriptprefix + toolprefix + "clang++" + scriptsuffix
 
     executable_extension = invoker.executable_extension
+
+    toolchain_args = {
+      is_clang = true
+      current_cpu = "pnacl"
+    }
   }
 }
 
 pnacl_toolchain("newlib_pnacl") {
   executable_extension = ".pexe"
 
   # The pnacl-finalize tool turns a .pexe.debug file into a .pexe file.
   # It's very similar in purpose to the traditional "strip" utility: it
   # turns what comes out of the linker into what you actually want to
   # distribute and run.  PNaCl doesn't have a "strip"-like utility that
@@ skipping 25 matching lines @@
 
   # TODO(mcgrathr): Hoist this to top level when
   # https://code.google.com/p/chromium/issues/detail?id=395883 is fixed.
   if (host_os == "win") {
     toolsuffix = ".exe"
   } else {
     toolsuffix = ""
   }
 
   nacl_toolchain("glibc_" + toolchain_cpu) {
-    is_clang = false
-    is_nacl_glibc = true
-
     cc = toolprefix + "gcc" + toolsuffix
     cxx = toolprefix + "g++" + toolsuffix
     ar = toolprefix + "ar" + toolsuffix
     ld = cxx
     readelf = toolprefix + "readelf" + toolsuffix
     nm = toolprefix + "nm" + toolsuffix
     strip = toolprefix + "strip" + toolsuffix
+
+    toolchain_args = {
+      current_cpu = toolchain_cpu
+      is_clang = false
+      is_nacl_glibc = true
+    }
   }
 }
 
 nacl_glibc_toolchain("x86") {
   toolchain_package = "nacl_x86_glibc"
   toolchain_revision = nacl_x86_glibc_rev
 
   # Rely on the :compiler_cpu_abi config adding the -m32 flag here rather
   # than using the i686-nacl binary directly.  This is a because i686-nacl-gcc
   # is a shell script wrapper around x86_64-nacl-gcc and goma has trouble with
@@ skipping 29 matching lines @@
 
   # TODO(mcgrathr): Hoist this to top level when
   # https://code.google.com/p/chromium/issues/detail?id=395883 is fixed.
   if (host_os == "win") {
     toolsuffix = ".exe"
   } else {
     toolsuffix = ""
   }
 
   nacl_toolchain("clang_newlib_" + toolchain_cpu) {
-    is_clang = true
     cc = toolprefix + "clang" + toolsuffix
     cxx = toolprefix + "clang++" + toolsuffix
     ar = toolprefix + "ar" + toolsuffix
     ld = cxx
     readelf = toolprefix + "readelf" + toolsuffix
     nm = toolprefix + "nm" + toolsuffix
     strip = toolprefix + "strip" + toolsuffix
+
+    toolchain_args = {
+      current_cpu = toolchain_cpu
+      is_clang = true
+    }
   }
 }
 
 template("nacl_irt_toolchain") {
   toolchain_cpu = target_name
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
 
   # TODO(mcgrathr): See above.
   pnacl_newlib_rev = revisions[2]
 
@@ skipping 14 matching lines @@
   link_irt = rebase_path("//native_client/build/link_irt.py", root_build_dir)
 
   tls_edit_label =
       "//native_client/src/tools/tls_edit:tls_edit($host_toolchain)"
   host_toolchain_out_dir =
       rebase_path(get_label_info(tls_edit_label, "root_out_dir"),
                   root_build_dir)
   tls_edit = "${host_toolchain_out_dir}/tls_edit"
 
   nacl_toolchain("irt_" + toolchain_cpu) {
-    is_clang = true
     cc = toolprefix + "clang" + toolsuffix
     cxx = toolprefix + "clang++" + toolsuffix
     ar = toolprefix + "ar" + toolsuffix
     readelf = toolprefix + "readelf" + toolsuffix
     nm = toolprefix + "nm" + toolsuffix
     strip = toolprefix + "strip" + toolsuffix
 
-    # Always build the IRT with full debugging symbols, regardless of
-    # how Chromium itself is being built (or other NaCl executables).
-    symbol_level = 2
-
     # Some IRT implementations (notably, Chromium's) contain C++ code,
     # so we need to link w/ the C++ linker.
     ld = "${python_path} ${link_irt} --tls-edit=${tls_edit} --link-cmd=${cxx} --readelf-cmd=${readelf}"
 
+    toolchain_args = {
+      current_cpu = toolchain_cpu
+      is_clang = true
+
+      # Always build the IRT with full debugging symbols, regardless of
+      # how Chromium itself is being built (or other NaCl executables).
+      symbol_level = 2
+    }
+
     # TODO(ncbray): depend on link script
     deps = [
       tls_edit_label,
     ]
   }
 }
 
 template("nacl_clang_toolchains") {
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
   nacl_clang_toolchain(target_name) {
     toolchain_tuple = invoker.toolchain_tuple
   }
   nacl_irt_toolchain(target_name) {
     toolchain_tuple = invoker.toolchain_tuple
   }
 }
 
 nacl_clang_toolchains("x86") {
   # Rely on :compiler_cpu_abi adding -m32.  See nacl_x86_glibc above.
   toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_clang_toolchains("x64") {
   toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_clang_toolchains("arm") {
   toolchain_tuple = "arm-nacl"
 }