diff options
| author | Ujjwal Sharma <usharma1998@gmail.com> | 2018-06-25 16:17:16 +0530 |
|---|---|---|
| committer | Ujjwal Sharma <usharma1998@gmail.com> | 2018-07-29 20:27:31 +0530 |
| commit | 51812ff12b9e10549725bcda57167148428e256c (patch) | |
| tree | 123b492db307215d49baec9bf6d6518dff8916ae /tools/gyp | |
| parent | fc81e801913de3e3f3c0c8e26c105f983a74e539 (diff) | |
| download | android-node-v8-51812ff12b9e10549725bcda57167148428e256c.tar.gz android-node-v8-51812ff12b9e10549725bcda57167148428e256c.tar.bz2 android-node-v8-51812ff12b9e10549725bcda57167148428e256c.zip | |
tools: patch gyp to avoid xcrun errors
Previously running ./configure with only the Xcode Command Line Tools
installed would give:
xcrun: error: unable to lookup item 'PlatformPath' from command line tools installation
xcrun: error: unable to lookup item 'PlatformPath' in SDK '/'
Co-authored-by: Ben Noordhuis <info@bnoordhuis.nl>
Fixes: https://github.com/nodejs/node/issues/12531
PR-URL: https://github.com/nodejs/node/pull/21520
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/gyp')
| -rw-r--r-- | tools/gyp/pylib/gyp/xcode_emulation.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py index 9082b9da35..c303313a30 100644 --- a/tools/gyp/pylib/gyp/xcode_emulation.py +++ b/tools/gyp/pylib/gyp/xcode_emulation.py @@ -645,9 +645,10 @@ class XcodeSettings(object): cflags += self._Settings().get('WARNING_CFLAGS', []) - platform_root = self._XcodePlatformPath(configname) - if platform_root and self._IsXCTest(): - cflags.append('-F' + platform_root + '/Developer/Library/Frameworks/') + if self._IsXCTest(): + platform_root = self._XcodePlatformPath(configname) + if platform_root: + cflags.append('-F' + platform_root + '/Developer/Library/Frameworks/') if sdk_root: framework_root = sdk_root @@ -913,10 +914,11 @@ class XcodeSettings(object): for directory in framework_dirs: ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) - platform_root = self._XcodePlatformPath(configname) - if sdk_root and platform_root and self._IsXCTest(): - ldflags.append('-F' + platform_root + '/Developer/Library/Frameworks/') - ldflags.append('-framework XCTest') + if self._IsXCTest(): + platform_root = self._XcodePlatformPath(configname) + if sdk_root and platform_root: + ldflags.append('-F' + platform_root + '/Developer/Library/Frameworks/') + ldflags.append('-framework XCTest') is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension() if sdk_root and is_extension: |