Remove dependency on scan-build wrapper script for Clang analysis builds.

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 56 matching lines @@
                     root_build_dir)
 
     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
     }
+    forward_variables_from(invoker,
+                           [
+                             "executable_extension",
+                             "is_clang_analysis_supported",
+                           ])
 
     # 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
   # you ever actually want to use other than pnacl-finalize, so just
   # make pnacl-finalize the strip tool rather than adding an additional
   # step like "postlink" to run pnacl-finalize.
   strip = "finalize"
 }
 
 pnacl_toolchain("newlib_pnacl_nonsfi") {
   executable_extension = ""
   strip = "strip"
+
+  if (use_clang_static_analyzer) {

[Wez, 2017/02/03 08:05:01]

nit: Why is this conditional on the analyzer being enabled? Surely it's not
supported no matter what?

[Kevin M, 2017/02/03 18:46:29]

It's a dead store if analysis isn't enabled, which GN treats as errors.

[Wez, 2017/02/03 19:27:54]

Aha - thanks for clarifying. :)

+    is_clang_analysis_supported = false
+  }
 }
 
 template("nacl_glibc_toolchain") {
   toolchain_cpu = target_name
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
   assert(defined(invoker.toolchain_package), "Must define toolchain_package")
   assert(defined(invoker.toolchain_revision), "Must define toolchain_revision")
   forward_variables_from(invoker,
                          [
                            "toolchain_package",
@@ skipping 133 matching lines @@
   toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_clang_toolchains("arm") {
   toolchain_tuple = "arm-nacl"
 }
 
 nacl_clang_toolchains("mipsel") {
   toolchain_tuple = "mipsel-nacl"
 }