Allow a custom toolchain to be injected into BUILDCONFIG.gn

build/config/BUILDCONFIG.gn

Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 234332b8547e95b0185e9bc4bcaaf1c1bfedcf63..e3a324f56568ba91100fb3c1087be8b72273b7c4 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -132,9 +132,26 @@ declare_args() {
     cros_use_custom_toolchain = false
   }
 
+  # Allows the path to a custom target toolchain to be injected as a single
+  # argument, and set as the default toolchain.
+  # Note: On ChromeOS, do not set this argument. Instead, set
+  # cros_use_custom_toolchain, and set each of the args required by
+  # //build/toolchain/cros:target.
+  custom_toolchain = ""

[brettw, 2015/09/28 19:58:28]

We need to keep this file cleaner than this. Please restructure the cros code so
that everybody uses the same custom_toolchain variable.

[slan, 2015/09/28 20:50:40]

There are two paths around this redundancy:

1) All ChromeOS builds use |custom_toolchain|, and |cros_use_custom_toolchain|
goes away.

The reason that I did not go straight to this solution is that it will break any
ChromeOS build relying on |cros_use_custom_toolchain|. Although this should have
minimal impact in Chrome, it will likely have a huge impact on the CrOS internal
build infrastructure. 

2) Allow chromecast builds to utilize //build/toolchain/cros:target as the
default toolchain. 

This is the path of least resistance, but it a) forces us to introduce
is_chromecast here, and b) is non-intuitive. I would view this as a temporary
solution, but I would prefer it to blocking this patch on  the issues presented
by #1

Which idea did you have in mind?

I will reach out to a couple of CrOS folks to figure out what needs to happen if
we go with #1.

[slan, 2015/09/28 21:21:42]

Removed.

+
   # DON'T ADD MORE FLAGS HERE. Read the comment above.
 }
 
+if (current_os == "chromeos") {
+  assert(
+      custom_toolchain == "",
+      "|custom_toolchain| should not be set in args on ChromeOS. Set cros_use_custom_toolchain instead.")
+
+  if (cros_use_custom_toolchain) {
+    custom_toolchain = "//build/toolchain/cros:target"
+  }
+}
+
 # =============================================================================
 # OS DEFINITIONS
 # =============================================================================
@@ -530,9 +547,6 @@ if (is_win) {
     host_toolchain = "//build/toolchain/linux:$host_cpu"
     set_default_toolchain("//build/toolchain/linux:$current_cpu")
   }
-  if (is_chromeos && cros_use_custom_toolchain) {
-    set_default_toolchain("//build/toolchain/cros:target")
-  }
 } else if (is_mac) {
   host_toolchain = "//build/toolchain/mac:clang_x64"
   set_default_toolchain(host_toolchain)
@@ -547,6 +561,11 @@ if (is_win) {
   host_toolchain = "//build/toolchain/linux:clang_x64"
 }
 
+# Set the custom default toolchain.
+if (custom_toolchain != "") {
+  set_default_toolchain(custom_toolchain)

[brettw, 2015/09/28 19:58:28]

let's restructure the code above to assign to a variable _default_toolchain and
then call set_default_toolchain once at the bottom, either with that value, or
the custom one. It seems like poor form to call a function and then call it
again with a different value.

[slan, 2015/09/28 20:50:40]

Done.

+}
+
 # ==============================================================================
 # COMPONENT SETUP
 # ==============================================================================