at v206 936 B view raw
1diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py 2--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100 3+++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100 4@@ -1018,12 +1033,16 @@ 5 # Since the value returned by this function is only used when ARCHS is not 6 # set, then on iOS we return "i386", as the default xcode project generator 7 # does not set ARCHS if it is not set in the .gyp file. 8- if self.isIOS: 9+ 10+ try: 11+ if self.isIOS: 12+ return 'i386' 13+ version, build = self._XcodeVersion() 14+ if version >= '0500': 15+ return 'x86_64' 16 return 'i386' 17- version, build = self._XcodeVersion() 18- if version >= '0500': 19+ except: 20 return 'x86_64' 21- return 'i386' 22 23 class MacPrefixHeader(object): 24 """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.