Revert of untrusted.gyp to fix goma_status=ok error.

build/untrusted.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'variables': {
       # Enable -Werror by default, but put it in a variable so it can
       # be optionally disabled.
       'werror%': '-Werror',
@@ skipping 27 matching lines @@
       'DYNAMIC_ANNOTATIONS_ENABLED=1',
       'DYNAMIC_ANNOTATIONS_PREFIX=NACL_',
     ],
     'nacl_default_compile_flags': [
       #'-std=gnu99',  Added by build_nexe
       '-O2',
       '-g',
       '-Wall',
       '-fdiagnostics-show-option',
       '<(werror)',
-    ],
-    'conditions': [
-      ['goma_status!="ok"', {
-        'gomadir': '',
-      }],
-    ],
+    ]
   },
   'conditions': [
     ['target_arch=="ia32" or target_arch=="x64"', {
       # Common defaults for all x86 nacl-gcc targets
       'target_defaults': {
         'conditions': [
           ['OS=="win"', {
             'variables': {
               # NOTE: Python is invoked differently by the Native Client
               # builders than the Chromium builders. Invoking using
@@ skipping 188 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nexe',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_newlib64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
              ],
            }],
            # x86-64 newlib library action
            ['nlib_target!="" and build_newlib!=0 and enable_x86_64!=0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nlib',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_newlib64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
              ],
            }],
            # x86-64 IRT nexe action
            ['nexe_target!="" and build_irt!=0 and enable_x86_64!=0', {
              'variables': {
@@ skipping 23 matching lines @@
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nexe_pnacl',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--config-name', '<(CONFIGURATION_NAME)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=--target=x86_64-nacl ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=--target=x86_64-nacl -arch x86-64 --pnacl-allow-translate --pnacl-allow-native -Wt,-mtls-use-call -Wn,-Trodata-segment=<(NACL_IRT_DATA_START) -Wn,-Ttext-segment=<(NACL_IRT_TEXT_START) -B>(tc_lib_dir_irt64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
              ],
            }],
            # x86-64 IRT library action
            ['nlib_target!="" and build_irt!=0 and enable_x86_64!=0', {
              'variables': {
@@ skipping 23 matching lines @@
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'newlib_nlib_pnacl',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib64)',
                    '--objdir', '>(objdir_newlib64)',
                    '--config-name', '<(CONFIGURATION_NAME)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=--target=x86_64-nacl ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=--target=x86_64-nacl -B>(tc_lib_dir_irt64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
              ],
            }],
            # x86-32 newlib nexe action
            ['nexe_target!="" and build_newlib!=0 and enable_x86_32!=0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nexe',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_newlib32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
              ],
            }],
            # x86-32 newlib library action
            ['nlib_target!="" and build_newlib!=0 and enable_x86_32!=0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nlib',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_newlib32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
              ],
            }],
            # x86-32 IRT nexe build
            ['nexe_target!="" and build_irt!=0 and enable_x86_32!=0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nexe',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_irt32) -Wl,--build-id,--section-start,.note.gnu.build-id=<(NACL_IRT_DATA_START) -Wl,-Ttext-segment=<(NACL_IRT_TEXT_START) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
              ],
            }],
            # x86-32 IRT library build
            ['nlib_target!="" and build_irt!=0 and enable_x86_32!=0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'newlib_nlib',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_newlib32)',
                    '--objdir', '>(objdir_newlib32)',
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_irt32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib32)',
                  ],
                },
              ],
            }],
         ],
       },
     }], # end x86 gcc nexe/nlib actions
@@ skipping 28 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # arm newlib library action
           ['force_arm_pnacl==0 and nlib_target!="" and build_newlib!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # arm irt nexe action
           ['force_arm_pnacl==0 and nexe_target!="" and build_irt!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_irt_arm) -Wl,-Trodata-segment=<(NACL_IRT_DATA_START) -Wl,-Ttext-segment=<(NACL_IRT_TEXT_START) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # arm IRT library action
           ['force_arm_pnacl==0 and nlib_target!="" and build_irt!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=-Wno-unused-local-typedefs -Wno-psabi ^(newlib_tls_flags) ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_irt_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
           # pnacl ARM library build using biased bitcode. This is currently
           # used to build the IRT shim. TODO(dschuff): see if this can be
           # further simplified, perhaps using re-using the plib build below
@@ skipping 24 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'arm',
                   '--build', 'newlib_nlib_pnacl',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_arm)',
                   '--objdir', '>(objdir_newlib_arm)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags=--target=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_arm)',
                 ],
               },
             ],
           }],
         ], # end target_conditions for arm newlib (nexe/nlib, force_arm_pnacl)
       },
     }], # end target_arch = arm
@@ skipping 28 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags= ^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_mips) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_mips)',
                 ],
               },
             ],
           }],
           # mips newlib library action
           ['nlib_target!="" and build_newlib!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags= ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_mips) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_mips)',
                 ],
               },
             ],
           }],
           # mips irt nexe action
           ['nexe_target!="" and build_irt!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nexe',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags= ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags= -arch mips --pnacl-allow-translate --pnacl-allow-native -Wt,-mtls-use-call --pnacl-disable-abi-check -Wl,-Trodata-segment=<(NACL_IRT_DATA_START) -Wl,-Ttext-segment=<(NACL_IRT_TEXT_START) -B>(tc_lib_dir_irt_mips) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_mips)',
                 ],
               },
             ],
           }],
           # mips IRT library action
           ['nlib_target!="" and build_irt!=0', {
             'variables': {
@@ skipping 22 matching lines @@
                   '<(DEPTH)/native_client/build/build_nexe.py',
                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                   '>@(extra_args)',
                   '--arch', 'mips',
                   '--build', 'newlib_nlib',
                   '--root', '<(DEPTH)',
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                   '--compile_flags= ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-                  '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_irt_mips) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_mips)',
                 ],
               },
             ],
           }],
         ], # end target_conditions for mips newlib
       },
     }], # end target_arch = mips
@@ skipping 28 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nexe',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc64)',
                    '--objdir', '>(objdir_glibc64)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_glibc64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc64)',
                  ],
                },
              ],
            }],
            # x86-32 glibc nexe action
            ['nexe_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nexe',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc32)',
                    '--objdir', '>(objdir_glibc32)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_glibc32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc32)',
                  ],
                },
              ],
            }],
            # x86-64 glibc static library action
            ['nlib_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nlib',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc64)',
                    '--objdir', '>(objdir_glibc64)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_glibc64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc64)',
                  ],
                },
              ],
            }],
            # x86-32 glibc static library action
            ['nlib_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nlib',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc32)',
                    '--objdir', '>(objdir_glibc32)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_glibc32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc32)',
                  ],
                },
              ],
            }],
            # x86-64 glibc shared library action
            ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '--arch', 'x86-64',
                    '--build', 'glibc_nso',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc64)',
                    '--objdir', '>(objdir_glibc64)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m64 -fPIC ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-B>(tc_lib_dir_glibc64) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc64)',
                  ],
                },
              ],
            }],
            # x86-32 glibc shared library action
            ['nso_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
@@ skipping 22 matching lines @@
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '>@(extra_args)',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
                    '--arch', 'x86-32',
                    '--build', 'glibc_nso',
                    '--root', '<(DEPTH)',
                    '--name', '>(out_glibc32)',
                    '--objdir', '>(objdir_glibc32)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=-m32 -fPIC ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
-                   '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=-m32 -B>(tc_lib_dir_glibc32) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_glibc32)',
                  ],
                },
              ],
            }],
         ], # end target_conditions for glibc (nexe/nlib/nso, x86-32/64)
       },
     }], # end target_arch == ia32 or x64
@@ skipping 69 matching lines @@
               '<(DEPTH)/native_client/build/build_nexe.py',
               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
               '>@(extra_args)',
               '--arch', 'pnacl',
               '--build', 'newlib_pexe',
               '--root', '<(DEPTH)',
               '--name', '>(out_pnacl_newlib)',
               '--objdir', '>(objdir_pnacl_newlib)',
               '--include-dirs=>(tc_include_dir_pnacl_newlib) ^(include_dirs) >(_include_dirs)',
               '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-              '--gomadir', '<(gomadir)',
               '--defines=^(defines) >(_defines)',
               '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',
               '--source-list=^(source_list_pnacl_newlib)',
             ],
           }],
           'target_conditions': [
             [ 'enable_x86_32!=0', {
               'actions': [{
                 'action_name': 'translate newlib pexe to x86-32 nexe',
                 'msvs_cygwin_shell': 0,
@@ skipping 98 matching lines @@
               '<(DEPTH)/native_client/build/build_nexe.py',
               '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/',
               '>@(extra_args)',
               '--arch', 'pnacl',
               '--build', 'newlib_plib',
               '--root', '<(DEPTH)',
               '--name', '>(out_pnacl_newlib)',
               '--objdir', '>(objdir_pnacl_newlib)',
               '--include-dirs=>(tc_include_dir_pnacl_newlib) ^(include_dirs) >(_include_dirs)',
               '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
-              '--gomadir', '<(gomadir)',
               '--defines=^(defines) >(_defines)',
               '--link_flags=-B>(tc_lib_dir_pnacl_newlib) ^(link_flags) >(_link_flags)',
               '--source-list=^(source_list_pnacl_newlib)',
             ],
           },
         ],
       }],
     ], # end target_conditions for pnacl pexe/plib
   },
 }