diff options
author | isaacs <i@izs.me> | 2014-01-12 02:33:03 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2014-01-14 06:30:26 +0400 |
commit | dd300385f7e1749bd51add868278ad97f90d5a77 (patch) | |
tree | 2192ce20ce25374846f7b74670bd3928de7ce8e4 /node_modules/node-gyp | |
parent | 0a03e904474d6323356b4fc0178383bb3e17841d (diff) |
node-gyp@0.12.2
Diffstat (limited to 'node_modules/node-gyp')
-rw-r--r-- | node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py | 32 | ||||
-rw-r--r-- | node_modules/node-gyp/package.json | 10 |
2 files changed, 25 insertions, 17 deletions
diff --git a/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py index f9cec3363..d50eac004 100644 --- a/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +++ b/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py @@ -273,7 +273,14 @@ class XcodeSettings(object): return out.rstrip('\n') def _GetSdkVersionInfoItem(self, sdk, infoitem): - return self._GetStdout(['xcodebuild', '-version', '-sdk', sdk, infoitem]) + # xcodebuild requires Xcode and can't run on Command Line Tools-only + # systems from 10.7 onward. + # Since the CLT has no SDK paths anyway, returning None is the + # most sensible route and should still do the right thing. + try: + return self._GetStdout(['xcodebuild', '-version', '-sdk', sdk, infoitem]) + except: + pass def _SdkRoot(self, configname): if configname is None: @@ -397,10 +404,11 @@ class XcodeSettings(object): cflags += self._Settings().get('WARNING_CFLAGS', []) - config = self.spec['configurations'][self.configname] - framework_dirs = config.get('mac_framework_dirs', []) - for directory in framework_dirs: - cflags.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: + cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) self.configname = None return cflags @@ -647,10 +655,11 @@ class XcodeSettings(object): for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): ldflags.append('-Wl,-rpath,' + rpath) - config = self.spec['configurations'][self.configname] - framework_dirs = config.get('mac_framework_dirs', []) - for directory in framework_dirs: - ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) + 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)', self._SdkPath())) self.configname = None return ldflags @@ -826,7 +835,10 @@ class XcodeSettings(object): l = '-l' + m.group(1) else: l = library - return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + if self._SdkPath(): + return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + else: + return l def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json index 5c4098e91..b28964c5e 100644 --- a/node_modules/node-gyp/package.json +++ b/node_modules/node-gyp/package.json @@ -10,7 +10,7 @@ "bindings", "gyp" ], - "version": "0.12.1", + "version": "0.12.2", "installVersion": 9, "author": { "name": "Nathan Rajlich", @@ -50,10 +50,6 @@ "url": "https://github.com/TooTallNate/node-gyp/issues" }, "homepage": "https://github.com/TooTallNate/node-gyp", - "_id": "node-gyp@0.12.1", - "dist": { - "shasum": "edc233dc9bbbd567cb167adf96c31a245c2712a4" - }, - "_from": "node-gyp@latest", - "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.12.1.tgz" + "_id": "node-gyp@0.12.2", + "_from": "node-gyp@latest" } |