Only build the x86 arches we actually need.

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 161 matching lines @@
           'include_dirs': ['<(DEPTH)'],
           'defines': [
             '<@(nacl_default_defines)',
             'NACL_BUILD_ARCH=mips',
            ],
            'sources': [],
            'link_flags': [],
          },
        },
     }],
-    ['target_arch=="ia32" or target_arch=="x64"', {
+    ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
       'target_defaults': {
         # x86-64 newlib nexe action
         'target_conditions': [
            ['nexe_target!="" and build_newlib!=0 and enable_x86_64!=0', {
              'variables': {
                 'tool_name': 'newlib',
                 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe',
                 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
              },
              'actions': [
@@ skipping 163 matching lines @@
                    '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                    '--gomadir', '<(gomadir)',
                    '--defines=^(defines) >(_defines)',
                    '--link_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
                    '--source-list=^(source_list_newlib64)',
                  ],
                },
              ],
            }],
+        ],
+      },
+    }],
+    ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {

[Mark Seaborn, 2014/07/22 17:40:27]

64-bit Windows Chrome builds don't need to include x86-32 nexes, AFAIK.

+      'target_defaults': {
+        # x86-64 newlib nexe action

[binji, 2014/07/02 18:49:10]

bad comment

+        'target_conditions': [
            # x86-32 newlib nexe action
            ['nexe_target!="" and build_newlib!=0 and enable_x86_32!=0', {
              'variables': {
                 'tool_name': 'newlib',
                 'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe',
                 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
              },
              'actions': [
                {
                  'action_name': 'build newlib x86-32 nexe',
@@ skipping 1173 matching lines @@
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_pnacl_newlib) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_pnacl_newlib_arm)',
                 ],
               },
             ],
           }],
         ],
       }], # end ARM
       # ia32 or x64 (want to build both for Windows)
       ['target_arch=="ia32" or target_arch=="x64"', {

[Mark Seaborn, 2014/07/22 17:40:27]

What about this one?

To avoid duplication, can we define some "build for x86_32" and "build for
x86_64" variables in a single place?

         'target_conditions': [
           # x64
           ['enable_x86_64!=0 and disable_pnacl==0 and pnacl_native_biased==1 '
            'and nlib_target!="" and build_pnacl_newlib!=0', {
              'variables': {
                'tool_name': 'pnacl_newlib_x86_64',
                'out_pnacl_newlib_x86_64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib-x86-64/>(nlib_target)',
                'objdir_pnacl_newlib_x86_64%': '>(INTERMEDIATE_DIR)/<(tool_name)/>(_target_name)',
              },
              'actions': [
@@ skipping 175 matching lines @@
                 ],
               },
             ],
           }],
         ],
       }], # end MIPS
       # end pnacl actions for building ABI-biased native libraries
     ], # end conditions for pnacl biased nlib
   },
 }