Allow a custom toolchain to be injected into BUILDCONFIG.gn

build/config/gcc/gcc_version.gni

Index: build/config/gcc/gcc_version.gni
diff --git a/build/config/gcc/gcc_version.gni b/build/config/gcc/gcc_version.gni
index 6741e45bf39104ab6180da6c1b40b3780c14b40d..31b7b13e99b67e56036096638f2182838ac07b6f 100644
--- a/build/config/gcc/gcc_version.gni
+++ b/build/config/gcc/gcc_version.gni
@@ -2,25 +2,33 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-if (is_android) {
-  gcc_version = 49
-} else if (current_toolchain == "//build/toolchain/cros:target" ||
-           current_toolchain == "//build/toolchain/linux:mipsel") {
-  gcc_version = exec_script("../../compiler_version.py",
-                            [
-                              "target",
-                              "compiler",
-                            ],
-                            "value")
-} else if (current_toolchain == "//build/toolchain/linux:x64" ||
-           current_toolchain == "//build/toolchain/linux:x86") {
-  # These are both the same and just use the default gcc on the system.
-  gcc_version = exec_script("../../compiler_version.py",
-                            [
-                              "host",
-                              "compiler",
-                            ],
-                            "value")
-} else {
-  gcc_version = 0
+declare_args() {
+  # This allows the gcc_version to be overriden when using a custom toolchanin

[Dirk Pranke, 2015/09/28 19:16:33]

typo: "toolchanin"

[slan, 2015/09/28 19:44:42]

Done.

+  # If the gcc_version is {X}.{Y}, set this value as XY.
+  gcc_version = -1
+}
+
+if (gcc_version == -1) {
+  if (is_android) {
+    gcc_version = 49
+  } else if (current_toolchain == "//build/toolchain/cros:target" ||
+             current_toolchain == "//build/toolchain/linux:mipsel") {
+    gcc_version = exec_script("../../compiler_version.py",
+                              [
+                                "target",
+                                "compiler",
+                              ],
+                              "value")
+  } else if (current_toolchain == "//build/toolchain/linux:x64" ||
+             current_toolchain == "//build/toolchain/linux:x86") {
+    # These are both the same and just use the default gcc on the system.
+    gcc_version = exec_script("../../compiler_version.py",
+                              [
+                                "host",
+                                "compiler",
+                              ],
+                              "value")
+  } else {
+    gcc_version = 0
+  }
 }