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

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index e010b3be52842a4b052b2a42c7f463e701e159bb..945e8b260e14a391d0278fe0ed4ddca0a0152a48 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -370,8 +370,7 @@ def GnNinjaInstall(pepperdir, toolchains):
       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)
 
@@ -403,14 +402,10 @@ 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'])
-  if platform != 'mac':
-    GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
+  GnNinjaBuild('x64', MakeNinjaRelPath('-x64'), ['nacl_sdk_untrusted=true'])
+  GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))
 
-  if platform == 'linux':
+  if getos.GetPlatform() == 'linux':
     GnNinjaBuild('arm', MakeNinjaRelPath('-arm'))
 
 
@@ -435,9 +430,10 @@ def GnNinjaBuild(arch, out_dir, extra_gn_args=None):
   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)