[NaCl SDK] Re-enable 32-bit sel_ldr build for mac

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 352 matching lines @@
   tools_dir = os.path.join(pepperdir, 'tools')
   buildbot_common.MakeDir(tools_dir)
 
   # Add .exe extensions to all windows tools
   for pair in tools_files_x86 + tools_files_x64:
     if platform == 'win' and not os.path.splitext(pair[0])[1]:
       pair[0] += '.exe'
       pair[1] += '.exe'
 
   InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_x64)
-  if platform != 'mac':
-    InstallFiles(GetNinjaOutDir('x86'), tools_dir, tools_files_x86)
+  InstallFiles(GetNinjaOutDir('x86'), tools_dir, tools_files_x86)
   if platform == 'linux':
     InstallFiles(GetNinjaOutDir('arm'), tools_dir, tools_files_arm)
 
   stub_dir = os.path.join(SRC_DIR, 'ppapi/native_client/src/untrusted/irt_stub')
   for tc in toolchains:
     if tc in ('host', 'clang-newlib'):
       continue
     elif tc == 'pnacl':
       xarches = ('pnacl', 'x86', 'x64', 'arm')
     elif tc in ('x86_glibc'):
@@ skipping 11 matching lines @@
       InstallFiles(src_dir, dst_dir, ['libppapi_stub.a'])
       InstallFiles(stub_dir, dst_dir, ['libppapi.a'])
       if 'glibc' in tc:
         InstallFiles(stub_dir, dst_dir, ['libppapi.so'])
 
 
 def GnNinjaBuildAll(rel_out_dir):
   def MakeNinjaRelPath(suffix):
     return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), rel_out_dir + suffix)
 
-  platform = getos.GetPlatform()
+  GnNinjaBuild('x64', MakeNinjaRelPath('-x64'), ['nacl_sdk_untrusted=true'])
+  GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
 
-  GnNinjaBuild('x64', MakeNinjaRelPath('-x64'),
-      ['nacl_sdk_untrusted=true'])
-  if platform != 'mac':
-    GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
-
-  if platform == 'linux':
+  if getos.GetPlatform() == 'linux':
     GnNinjaBuild('arm', MakeNinjaRelPath('-arm'))
 
 
 def GetGNExecutable(platform):
   # TODO(sbc): Remove this code, which is duplicated from mb.py and simply
   # rely on the depot_tools gn wrapper which should be in the PATH.
   # http://crbug.com/588794
   if platform == 'linux':
     subdir, exe = 'linux64', 'gn'
   elif platform == 'mac':
     subdir, exe = 'mac', 'gn'
   else:
     subdir, exe = 'win', 'gn.exe'
   return os.path.join(SRC_DIR, 'buildtools', subdir, exe)
 
 
 def GnNinjaBuild(arch, out_dir, extra_gn_args=None):
   gn_args = ['is_debug=false']
   if extra_gn_args is not None:
     gn_args += extra_gn_args
   platform = getos.GetPlatform()
   if platform == 'mac':
     if options.mac_sdk:
       gn_args.append('mac_sdk_min="%s"' % options.mac_sdk)
-    # Without this the target_cpu='arm' build complains about missing code
-    # signing identity
-    gn_args.append('use_ios_simulator=true')
+    if arch == 'arm':
+      # Without this the target_cpu='arm' build complains about missing code
+      # signing identity
+      gn_args.append('use_ios_simulator=true')
 
   gn_exe = GetGNExecutable(platform)
 
   if arch is not None:
     gn_args.append('target_cpu="%s"' % arch)
     if arch == 'arm':
       if options.no_arm_trusted:
         gn_args.append('enable_cross_trusted=false')
 
   gn_args = ' '.join(gn_args)
@@ skipping 425 matching lines @@
       #BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')