GN: Remove redundant -m32 flag from nacl glibc x86 compiler

build/toolchain/nacl/BUILD.gn

 # Copyright (c) 2014 The Native Client 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/sysroot.gni")
 import("//build/config/nacl/config.gni")
 import("//build/toolchain/nacl_toolchain.gni")
 
 # Add the toolchain revision as a preprocessor define so that sources are
 # rebuilt when a toolchain is updated.
@@ skipping 88 matching lines @@
   strip = "finalize"
 }
 
 pnacl_toolchain("newlib_pnacl_nonsfi") {
   executable_extension = ""
   strip = "strip"
 }
 
 template("nacl_glibc_toolchain") {
   toolchain_cpu = target_name
-  toolchain_cc_args = ""
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
   assert(defined(invoker.toolchain_package), "Must define toolchain_package")
   assert(defined(invoker.toolchain_revision), "Must define toolchain_revision")
   forward_variables_from(invoker,
                          [
                            "toolchain_package",
                            "toolchain_revision",
-                           "toolchain_cc_args",
                          ])
 
   toolprefix = rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/" +
                                invoker.toolchain_tuple + "-",
                            root_build_dir)
 
   # TODO(mcgrathr): Hoist this to top level when
   # https://code.google.com/p/chromium/issues/detail?id=395883 is fixed.
   if (host_os == "win") {
     toolsuffix = ".exe"
   } else {
     toolsuffix = ""
   }
 
   nacl_toolchain("glibc_" + toolchain_cpu) {
     is_clang = false
     is_nacl_glibc = true
 
-    cc = toolprefix + "gcc" + toolsuffix + toolchain_cc_args
-    cxx = toolprefix + "g++" + toolsuffix + toolchain_cc_args
+    cc = toolprefix + "gcc" + toolsuffix
+    cxx = toolprefix + "g++" + toolsuffix
     ar = toolprefix + "ar" + toolsuffix
     ld = cxx
     readelf = toolprefix + "readelf" + toolsuffix
     nm = toolprefix + "nm" + toolsuffix
     strip = toolprefix + "strip" + toolsuffix
   }
 }
 
 nacl_glibc_toolchain("x86") {
   toolchain_package = "nacl_x86_glibc"
   toolchain_revision = nacl_x86_glibc_rev
 
-  # i686-nacl-gcc is not in goma (adding it would be tricky) so we use
-  # x86_64-nacl compiler with the -m32 flags.
+  # Rely on the :compiler_cpu_abi config adding the -m32 flag here rather
+  # than using the i686-nacl binary directly.  This is a because i686-nacl-gcc
+  # is a shell script wrapper around x86_64-nacl-gcc and goma has trouble with
+  # compiler executables that are shell scripts (so the i686 'compiler' is not
+  # currently in goma).
   toolchain_tuple = "x86_64-nacl"
-  toolchain_cc_args = " -m32"
 }
 
 nacl_glibc_toolchain("x64") {
   toolchain_package = "nacl_x86_glibc"
   toolchain_revision = nacl_x86_glibc_rev
   toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_glibc_toolchain("arm") {
   toolchain_package = "nacl_arm_glibc"
@@ skipping 92 matching lines @@
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
   nacl_clang_toolchain(target_name) {
     toolchain_tuple = invoker.toolchain_tuple
   }
   nacl_irt_toolchain(target_name) {
     toolchain_tuple = invoker.toolchain_tuple
   }
 }
 
 nacl_clang_toolchains("x86") {
-  toolchain_tuple = "i686-nacl"
+  # Rely on :compiler_cpu_abi adding -m32.  See nacl_x86_glibc above.
+  toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_clang_toolchains("x64") {
   toolchain_tuple = "x86_64-nacl"
 }
 
 nacl_clang_toolchains("arm") {
   toolchain_tuple = "arm-nacl"
 }