2016-01-09 23:38:27 +01:00
|
|
|
diff --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
|
|
|
|
|
index 30f27d5..eb178a5 100644
|
|
|
|
|
--- 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
|
|
|
|
|
@@ -1018,12 +1018,15 @@ class XcodeSettings(object):
|
2015-11-14 21:32:51 +01:00
|
|
|
# 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:
|
|
|
|
|
+ try:
|
|
|
|
|
+ if self.isIOS:
|
|
|
|
|
+ return 'i386'
|
|
|
|
|
+ version, build = self._XcodeVersion()
|
|
|
|
|
+ if version >= '0500':
|
|
|
|
|
+ return 'x86_64'
|
|
|
|
|
return 'i386'
|
|
|
|
|
- version, build = self._XcodeVersion()
|
|
|
|
|
- if version >= '0500':
|
|
|
|
|
+ except:
|
|
|
|
|
return 'x86_64'
|
|
|
|
|
- return 'i386'
|
|
|
|
|
|
|
|
|
|
class MacPrefixHeader(object):
|
|
|
|
|
"""A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
|
