diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/development/web/nodejs/no-xcode.patch | |
parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/development/web/nodejs/no-xcode.patch')
-rw-r--r-- | pkgs/development/web/nodejs/no-xcode.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch deleted file mode 100644 index 27c9774ee6b1..000000000000 --- a/pkgs/development/web/nodejs/no-xcode.patch +++ /dev/null @@ -1,57 +0,0 @@ -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: |