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

build/toolchain/gcc_toolchain.gni

 # Copyright (c) 2013 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.
 
 import("//build/config/nacl/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/cc_wrapper.gni")
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/toolchain.gni")
 
@@ skipping 392 matching lines @@
     # passed to the build. They are ignored when this is the default toolchain.
     toolchain_args() {
       current_cpu = invoker.toolchain_cpu
       current_os = invoker.toolchain_os
 
       # These values need to be passed through unchanged.
       host_toolchain = host_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
       }
       if (defined(invoker.is_component_build)) {
         is_component_build = invoker.is_component_build
       }
       if (defined(invoker.is_nacl_glibc)) {
         is_nacl_glibc = invoker.is_nacl_glibc
       }
       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
         is_cfi = false
         is_lsan = false
         is_msan = false
         is_syzyasan = false
         is_tsan = false
         is_ubsan = false
         is_ubsan_vptr = false
@@ skipping 36 matching lines @@
 
     forward_variables_from(invoker,
                            [
                              "toolchain_cpu",
                              "toolchain_os",
                              "use_gold",
                              "strip",
                            ])
   }
 }