build/toolchain/gcc_toolchain.gni: further fixes for var forwarding

build/toolchain/gcc_toolchain.gni

Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index 5100963c4b1bfcfffbc8fa93db4ec9a6f4b0546e..f38b5a3bfd50ef2fc47581e3dd9a826ecd3ddc82 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -410,12 +410,6 @@ template("gcc_toolchain") {
       target_os = target_os
       target_cpu = target_cpu
 
-      forward_variables_from(invoker,
-                             [
-                               "use_allocator",
-                               "use_gold",
-                             ])
-
       if (defined(invoker.is_clang)) {
         is_clang = invoker.is_clang
       }
@@ -428,6 +422,12 @@ template("gcc_toolchain") {
       if (defined(invoker.symbol_level)) {
         symbol_level = invoker.symbol_level
       }
+      if (defined(invoker.use_allocator)) {
+        use_allocator = invoker.use_allocator
+      }
+      if (defined(invoker.use_gold)) {
+        use_gold = invoker.use_gold
+      }
 
       if (defined(invoker.clear_sanitizers) && invoker.clear_sanitizers) {
         is_asan = false