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 160 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=="x64" or (target_arch=="ia32" and OS=="win")', {
       '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"', {
+      'target_defaults': {
+        '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 575 matching lines @@
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-stdlib=libstdc++ -B>(tc_lib_dir_irt_mips) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',
                   '--source-list=^(source_list_newlib_mips)',
                 ],
               },
             ],
           }],
         ], # end target_conditions for mips newlib
       },
     }], # end target_arch = mips
-    ['target_arch=="ia32" or target_arch=="x64"', {
+    ['target_arch=="x64" or (OS=="win" and target_arch=="ia32")', {
       'target_defaults': {
         # x86-64 glibc nexe action
         'target_conditions': [
            ['nexe_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
              'variables': {
                 'tool_name': 'glibc',
                 'out_glibc64%': '<(PRODUCT_DIR)/>(nexe_target)_glibc_x64.nexe',
                 'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
              },
              'actions': [
@@ skipping 26 matching lines @@
                    '--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': {
-                'tool_name': 'glibc',
-                'out_glibc32%': '<(PRODUCT_DIR)/>(nexe_target)_glibc_x32.nexe',
-                'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
-             },
-             'actions': [
-               {
-                 'action_name': 'build glibc x86-32 nexe',
-                 'variables': {
-                   'source_list_glibc32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
-                 },
-                 'msvs_cygwin_shell': 0,
-                 'description': 'building >(out_glibc32)',
-                 'inputs': [
-                    '<(DEPTH)/native_client/build/build_nexe.py',
-                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
-                    '>@(extra_deps)',
-                    '>@(extra_deps_glibc32)',
-                    '^(source_list_glibc32)',
-                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
-                 ],
-                 'outputs': ['>(out_glibc32)'],
-                 'action': [
-                   'python',
-                   '<(DEPTH)/native_client/build/build_nexe.py',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
-                   '>@(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': {
                 'tool_name': 'glibc',
                 'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_target_name)',
                 'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nlib_target)',
              },
              'actions': [
                {
                  'action_name': 'build glibc x86-64 nlib',
                  'variables': {
                    'source_list_glibc64%': '^|(<(tool_name)-x86-64.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc64)',
+                 'inputs': [
+                    '<(DEPTH)/native_client/build/build_nexe.py',
+                    '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
+                    '>@(extra_deps)',
+                    '>@(extra_deps_glibc64)',
+                    '^(source_list_glibc64)',
+                    '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
+                 ],
+                 'outputs': ['>(out_glibc64)'],
+                 'action': [
+                   'python',
+                   '<(DEPTH)/native_client/build/build_nexe.py',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
+                   '>@(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-64 glibc shared library action
+           ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+             'variables': {
+                'tool_name': 'glibc',
+                'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64-so/>(_target_name)',
+                'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nso_target)',
+             },
+             'actions': [
+               {
+                 'action_name': 'build glibc x86-64 nso',
+                 'variables': {
+                   'source_list_glibc64%': '^|(<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
+                 },
+                 'msvs_cygwin_shell': 0,
+                 'description': 'building >(out_glibc64)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
                     '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc64)',
                     '^(source_list_glibc64)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc64)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
+                   '>@(extra_args)',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
-                   '>@(extra_args)',
                    '--arch', 'x86-64',
-                   '--build', 'glibc_nlib',
+                   '--build', 'glibc_nso',
                    '--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)',
+                   '--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 static library action
-           ['nlib_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
+         ],
+       },
+    }],
+    ['target_arch=="ia32"', {
+      'target_defaults': {
+        'target_conditions': [
+           # x86-32 glibc nexe action
+           ['nexe_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
                 'tool_name': 'glibc',
-                'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)',
+                'out_glibc32%': '<(PRODUCT_DIR)/>(nexe_target)_glibc_x32.nexe',
                 'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
              },
              'actions': [
                {
-                 'action_name': 'build glibc x86-32 nlib',
+                 'action_name': 'build glibc x86-32 nexe',
                  'variables': {
                    'source_list_glibc32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
                  'description': 'building >(out_glibc32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
                     '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
                     '>@(extra_deps_glibc32)',
                     '^(source_list_glibc32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
                  'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
                    '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
                    '--arch', 'x86-32',
-                   '--build', 'glibc_nlib',
+                   '--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 shared library action
-           ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+           # x86-32 glibc static library action
+           ['nlib_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
                 'tool_name': 'glibc',
-                'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64-so/>(_target_name)',
-                'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nso_target)',
+                'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nlib_target)',
+                'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_target_name)',
              },
              'actions': [
                {
-                 'action_name': 'build glibc x86-64 nso',
+                 'action_name': 'build glibc x86-32 nlib',
                  'variables': {
-                   'source_list_glibc64%': '^|(<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
+                   'source_list_glibc32%': '^|(<(tool_name)-x86-32.>(_target_name).source_list.gypcmd ^(_sources) ^(sources))',
                  },
                  'msvs_cygwin_shell': 0,
-                 'description': 'building >(out_glibc64)',
+                 'description': 'building >(out_glibc32)',
                  'inputs': [
                     '<(DEPTH)/native_client/build/build_nexe.py',
                     '>!@pymod_do_main(scan_sources -I . >(include_dirs) >(_include_dirs) -S >(sources) >(_sources))',
                     '>@(extra_deps)',
-                    '>@(extra_deps_glibc64)',
-                    '^(source_list_glibc64)',
+                    '>@(extra_deps_glibc32)',
+                    '^(source_list_glibc32)',
                     '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/nacl_x86_glibc/stamp.prep',
                  ],
-                 'outputs': ['>(out_glibc64)'],
+                 'outputs': ['>(out_glibc32)'],
                  'action': [
                    'python',
                    '<(DEPTH)/native_client/build/build_nexe.py',
+                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
                    '>@(extra_args)',
-                   '-t', '<(SHARED_INTERMEDIATE_DIR)/sdk/',
-                   '--arch', 'x86-64',
-                   '--build', 'glibc_nso',
+                   '--arch', 'x86-32',
+                   '--build', 'glibc_nlib',
                    '--root', '<(DEPTH)',
-                   '--name', '>(out_glibc64)',
-                   '--objdir', '>(objdir_glibc64)',
+                   '--name', '>(out_glibc32)',
+                   '--objdir', '>(objdir_glibc32)',
                    '--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
-                   '--compile_flags=-m64 -fPIC ^(gcc_compile_flags) >(_gcc_compile_flags) ^(compile_flags) >(_compile_flags)',
+                   '--compile_flags=-m32 ^(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)',
+                   '--link_flags=-m32 -B>(tc_lib_dir_glibc32) ^(link_flags) >(_link_flags)',
+                   '--source-list=^(source_list_glibc32)',
                  ],
                },
              ],
            }],
            # x86-32 glibc shared library action
            ['nso_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
              'variables': {
                 'tool_name': 'glibc',
                 'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nso_target)',
                 'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32-so/>(_target_name)',
@@ skipping 30 matching lines @@
                    '--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
+    }],
   ],
   'target_defaults': {
     'gcc_compile_flags': [],
     'pnacl_compile_flags': [],
     'variables': {
       'disable_pnacl%': 0,
       'build_pnacl_newlib': 0,
       'pnacl_native_biased': 0,
       'nexe_target': '',
       'nlib_target': '',
@@ skipping 312 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"', {
+      ['target_arch=="x64" or (OS=="win" and target_arch=="ia32")', {
         '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 26 matching lines @@
                    '--include-dirs=>(tc_include_dir_pnacl_newlib) ^(include_dirs) >(_include_dirs)',
                    '--compile_flags=--target=x86_64-unknown-nacl --pnacl-allow-translate -arch x86-64 ^(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_x86_64)',
                  ],
                },
              ],
            }], # end x64
+         ],
+      }],
+      ['target_arch=="ia32"', {
+        'target_conditions': [
           # ia32
           ['enable_x86_32!=0 and disable_pnacl==0 and pnacl_native_biased==1 '
            'and nlib_target!="" and build_pnacl_newlib!=0', {
              'variables': {
                'tool_name': 'pnacl_newlib_x86_32',
                'out_pnacl_newlib_x86_32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib-x86-32/>(nlib_target)',
                'objdir_pnacl_newlib_x86_32%': '>(INTERMEDIATE_DIR)/<(tool_name)/>(_target_name)',
              },
              'actions': [
                {
@@ skipping 129 matching lines @@
                 ],
               },
             ],
           }],
         ],
       }], # end MIPS
       # end pnacl actions for building ABI-biased native libraries
     ], # end conditions for pnacl biased nlib
   },
 }