Enable 64-bit architectures by default for Xcode 5.1 and higher

pylib/gyp/xcode_emulation.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This module contains classes that help to emulate xcodebuild behavior on top of
 other build systems, such as make and ninja.
 """
 
 import copy
@@ skipping 926 matching lines @@
         sdk_root = items[-1]
         sdk_path = self._XcodeSdkPath(sdk_root)
         if sdk_path == default_sdk_path:
           return sdk_root
     return ''
 
   def _DefaultArch(self):
     # For Mac projects, Xcode changed the default value used when ARCHS is not
     # set from "i386" to "x86_64".
     #
-    # For iOS projects, if ARCHS is unset, it defaults to "armv7 armv7s" when
-    # building for a device, and the simulator binaries are always build for
-    # "i386".
+    # For iOS projects, the value used when ARCHS is unset depends on the
+    # version of Xcode. The following array summarize the default used:
     #
-    # For new projects, ARCHS is set to $(ARCHS_STANDARD_INCLUDING_64_BIT),
-    # which correspond to "armv7 armv7s arm64", and when building the simulator
-    # the architecture is either "i386" or "x86_64" depending on the simulated
-    # device (respectively 32-bit or 64-bit device).
+    #  Xcode Version | ARCHS for simulator | ARCHS for device
+    # ---------------+---------------------+--------------------
+    #     < 5.0      | i386                | armv7 armv7s
+    #     < 5.1 (*)  | i386 x86_64         | armv7 armv7s arm64
+    #    >= 5.1 (**) | i386 x86_64         | armv7 armv7s arm64
+    #
+    # (*): the default is $(ARCHS_STANDARD_INCLUDING_64_BIT) instead of the
+    # default of $(ARCHS_STANDARD) used by previous versions of Xcode.
+    #
+    # (**): the default is back to $(ARCHS_STANDARD), but the macro has been
+    # updated to also include 64-bit architectures.
     #
     # Since the value returned by this function is only used when ARCHS is not
     # set, then on iOS we return "i386", as the default xcode project generator
     # does not set ARCHS if it is not set in the .gyp file.
-    if self.isIOS:
-      return 'i386'
     version, build = XcodeVersion()
     if version >= '0500':
       return 'x86_64'
     return 'i386'
 
 class MacPrefixHeader(object):
   """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
 
   This feature consists of several pieces:
   * If GCC_PREFIX_HEADER is present, all compilations in that project get an
@@ skipping 473 matching lines @@
 def _IOSDefaultArchForSDKRoot(sdkroot):
   """Returns the expansion of standard ARCHS macro depending on the version
   of Xcode installed and configured, and which |sdkroot| to use (iphoneos or
   simulator)."""
   xcode_version, xcode_build = XcodeVersion()
   if xcode_version < '0500':
     if _IOSIsDeviceSDKROOT(sdkroot):
       return {'$(ARCHS_STANDARD)': ['armv7']}
     else:
       return {'$(ARCHS_STANDARD)': ['i386']}
-  else:
+  elif xcode_version < '0510':
     if _IOSIsDeviceSDKROOT(sdkroot):
       return {
           '$(ARCHS_STANDARD)': ['armv7', 'armv7s'],
           '$(ARCHS_STANDARD_INCLUDING_64_BIT)': ['armv7', 'armv7s', 'arm64'],
       }
     else:
       return {
           '$(ARCHS_STANDARD)': ['i386'],
           '$(ARCHS_STANDARD_INCLUDING_64_BIT)': ['i386', 'x86_64'],
       }
+  else:
+    if _IOSIsDeviceSDKROOT(sdkroot):
+      return {
+          '$(ARCHS_STANDARD)': ['armv7', 'armv7s', 'arm64'],
+          '$(ARCHS_STANDARD_INCLUDING_64_BIT)': ['armv7', 'armv7s', 'arm64'],
+      }
+    else:
+      return {
+          '$(ARCHS_STANDARD)': ['i386', 'x86_64'],
+          '$(ARCHS_STANDARD_INCLUDING_64_BIT)': ['i386', 'x86_64'],
+      }
 
 
 def _FilterIOSArchitectureForSDKROOT(xcode_settings):
   """Filter the ARCHS value from the |xcode_settings| dictionary to only
   contains architectures valid for the sdk configured in SDKROOT value."""
   defaults_archs = _IOSDefaultArchForSDKRoot(xcode_settings.get('SDKROOT', ''))
   allowed_archs = set()
   for archs in defaults_archs.itervalues():
     allowed_archs.update(archs)
   selected_archs = set()
@@ skipping 32 matching lines @@
       _FilterIOSArchitectureForSDKROOT(iphoneos_config_dict['xcode_settings'])
       _FilterIOSArchitectureForSDKROOT(config_dict['xcode_settings'])
   return targets
 
 def CloneConfigurationForDeviceAndEmulator(target_dicts):
   """If |target_dicts| contains any iOS targets, automatically create -iphoneos
   targets for iOS device builds."""
   if _HasIOSTarget(target_dicts):
     return _AddIOSDeviceConfigurations(target_dicts)
   return target_dicts