4356d0ccce
- Add no-xcode patch back into node v5. Reverts some of 5cb1e43fd6eb7f87c9b17e9dc6d1a92ae7c360a4 - Fix patch to apply correctly - Remove pkg-libpath patch from v4
58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
|
|
index 407ead0..8bf64e7 100644
|
|
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
|
|
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
|
|
@@ -446,10 +446,16 @@ class XcodeSettings(object):
|
|
|
|
def _XcodeSdkPath(self, sdk_root):
|
|
if sdk_root not in XcodeSettings._sdk_path_cache:
|
|
- sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
|
|
- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
|
|
- if sdk_root:
|
|
- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
|
|
+ try:
|
|
+ sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
|
|
+ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
|
|
+ if sdk_root:
|
|
+ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
|
|
+ except:
|
|
+ # if this fails it's because xcodebuild failed, which means
|
|
+ # the user is probably on a CLT-only system, where there
|
|
+ # is no valid SDK root
|
|
+ XcodeSettings._sdk_path_cache[sdk_root] = None
|
|
return XcodeSettings._sdk_path_cache[sdk_root]
|
|
|
|
def _AppendPlatformVersionMinFlags(self, lst):
|
|
@@ -572,10 +578,11 @@ class XcodeSettings(object):
|
|
framework_root = sdk_root
|
|
else:
|
|
framework_root = ''
|
|
- config = self.spec['configurations'][self.configname]
|
|
- framework_dirs = config.get('mac_framework_dirs', [])
|
|
- for directory in framework_dirs:
|
|
- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
|
|
+ if 'SDKROOT' in self._Settings():
|
|
+ config = self.spec['configurations'][self.configname]
|
|
+ framework_dirs = config.get('mac_framework_dirs', [])
|
|
+ for directory in framework_dirs:
|
|
+ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
|
|
|
|
self.configname = None
|
|
return cflags
|
|
@@ -826,10 +833,11 @@ class XcodeSettings(object):
|
|
sdk_root = self._SdkPath()
|
|
if not sdk_root:
|
|
sdk_root = ''
|
|
- config = self.spec['configurations'][self.configname]
|
|
- framework_dirs = config.get('mac_framework_dirs', [])
|
|
- for directory in framework_dirs:
|
|
- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
|
|
+ if 'SDKROOT' in self._Settings():
|
|
+ config = self.spec['configurations'][self.configname]
|
|
+ framework_dirs = config.get('mac_framework_dirs', [])
|
|
+ for directory in framework_dirs:
|
|
+ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
|
|
|
|
is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
|
|
if sdk_root and is_extension:
|