Move clang_version setting back into declare_args

build/toolchain/toolchain.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Toolchain-related configuration that may be needed outside the context of the
 # toolchain() rules themselves.
 
 import("//build/config/chrome_build.gni")
 
 declare_args() {
@@ skipping 16 matching lines @@
   # the CLANG_REVISION to use, instead of the version hard-coded into
   # //tools/clang/scripts/update.py. This should only be used in
   # conjunction with setting LLVM_FORCE_HEAD_REVISION in the
   # environment when `gclient runhooks` is run as well.
   llvm_force_head_revision = false
 
   # Compile with Xcode version of clang instead of hermetic version shipped
   # with the build. Used on iOS to ship official builds (as they are built
   # with the version of clang shipped with Xcode).
   use_xcode_clang = is_ios && is_official_build
-}
 
-if (is_clang) {
-  # Clang compiler version. Clang files are placed at version-dependent paths.
-  clang_version = "3.9.0"
+  if (is_clang) {
+    # Clang compiler version. Clang files are placed at version-dependent paths.
+    clang_version = "3.9.0"
 
-  if (llvm_force_head_revision) {
-    # TODO(hans): Remove after next Clang roll.
-    # ToT Clang has a higher version number.
-    clang_version = "4.0.0"
+    if (llvm_force_head_revision) {
+      # TODO(hans): Remove after next Clang roll.
+      # ToT Clang has a higher version number.
+      clang_version = "4.0.0"
+    }

[Dirk Pranke, 2016/08/02 23:58:59]

Can you move this all into a separate declare_args() block? I'm not sure if
this'll actually work correctly as written, because I think the
llvm_force_head_revision=true in your args.gn won't take effect until the end of
the first declare_args() block.

[Reid Kleckner, 2016/08/03 00:03:30]

Thanks! We probably wouldn't have caught that until it hit the clang TOT
waterfall if that's really how it works.

   }
 }
 
 assert(!use_xcode_clang || is_ios,
        "Using Xcode's clang is only supported in iOS builds")
 
 # Subdirectory within root_out_dir for shared library files.
 # TODO(agrieve): GYP sets this to "lib" for Linux & Android, but this won't work
 #     in GN until support for loadable_module() is added.
 #     See: https://codereview.chromium.org/1236503002/
@@ skipping 36 matching lines @@
 stamp_description = "STAMP {{output}}"
 copy_description = "COPY {{source}} {{output}}"
 if (host_os == "win") {
   stamp_command = "$python_path gyp-win-tool stamp {{output}}"
   copy_command =
       "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}"
 } else {
   stamp_command = "touch {{output}}"
   copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
 }