at 16.09-beta 1.0 kB view raw
1diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2index 30f27d5..eb178a5 100644 3--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 4+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 5@@ -1018,12 +1018,15 @@ class XcodeSettings(object): 6 # Since the value returned by this function is only used when ARCHS is not 7 # set, then on iOS we return "i386", as the default xcode project generator 8 # does not set ARCHS if it is not set in the .gyp file. 9- if self.isIOS: 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.