tjh.dev
1Index: pylib/gyp/xcode_emulation.py
2diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
3index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4fb61d6cb6 100644
4--- a/pylib/gyp/xcode_emulation.py
5+++ b/pylib/gyp/xcode_emulation.py
6@@ -236,8 +236,14 @@ class XcodeSettings(object):
7 if sdk_root.startswith('/'):
8 return sdk_root
9 if sdk_root not in XcodeSettings._sdk_path_cache:
10- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem(
11- sdk_root, 'Path')
12+ try:
13+ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem(
14+ sdk_root, 'Path')
15+ except:
16+ # if this fails it's because xcodebuild failed, which means
17+ # the user is probably on a CLT-only system, where there
18+ # is no valid SDK root
19+ XcodeSettings._sdk_path_cache[sdk_root] = None
20 return XcodeSettings._sdk_path_cache[sdk_root]
21
22 def _AppendPlatformVersionMinFlags(self, lst):
23@@ -340,10 +346,11 @@ class XcodeSettings(object):
24
25 cflags += self._Settings().get('WARNING_CFLAGS', [])
26
27- config = self.spec['configurations'][self.configname]
28- framework_dirs = config.get('mac_framework_dirs', [])
29- for directory in framework_dirs:
30- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
31+ if sdk_root:
32+ config = self.spec['configurations'][self.configname]
33+ framework_dirs = config.get('mac_framework_dirs', [])
34+ for directory in framework_dirs:
35+ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
36
37 self.configname = None
38 return cflags
39@@ -573,10 +580,11 @@ class XcodeSettings(object):
40 for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []):
41 ldflags.append('-Wl,-rpath,' + rpath)
42
43- config = self.spec['configurations'][self.configname]
44- framework_dirs = config.get('mac_framework_dirs', [])
45- for directory in framework_dirs:
46- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
47+ if self._SdkPath():
48+ config = self.spec['configurations'][self.configname]
49+ framework_dirs = config.get('mac_framework_dirs', [])
50+ for directory in framework_dirs:
51+ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
52
53 self.configname = None
54 return ldflags
55@@ -701,7 +709,10 @@ class XcodeSettings(object):
56 l = '-l' + m.group(1)
57 else:
58 l = library
59- return l.replace('$(SDKROOT)', self._SdkPath(config_name))
60+ if self._SdkPath():
61+ return l.replace('$(SDKROOT)', self._SdkPath(config_name))
62+ else:
63+ return l
64
65 def AdjustLibraries(self, libraries, config_name=None):
66 """Transforms entries like 'Cocoa.framework' in libraries into entries like