diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-02-10 09:27:52 +0900 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-09-16 06:30:19 -0400 |
| commit | 02c262a4c6c0281005076394ee7fea95d06b8a6e (patch) | |
| tree | b21b5ad374b4a2f98acec484d6917938dc959175 | |
| parent | f0fba0bce80e4ec606fad97ca0857ec7ba62e6bd (diff) | |
| download | node-02c262a4c6c0281005076394ee7fea95d06b8a6e.tar.gz | |
deps: fix gyp to work on MacOSX without XCode
This is a port of eb459c81512c2ce61ee488450fc2d4006cb63198 ,
used as a floating patch over gyp.
Original commit message:
This issue has already submitted to the upstream in
https://code.google.com/p/gyp/issues/detail?id=477
Use this commit until the upstream is to be fixed.
PR-URL: https://github.com/iojs/io.js/pull/1325
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This was ported to v0.10 in https://github.com/joyent/node/pull/25857
PR-URL: https://github.com/nodejs/node/pull/2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
| -rw-r--r-- | tools/gyp/pylib/gyp/xcode_emulation.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py index 47f9d520e..c002b112c 100644 --- a/tools/gyp/pylib/gyp/xcode_emulation.py +++ b/tools/gyp/pylib/gyp/xcode_emulation.py @@ -1479,6 +1479,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration, sdk_root = xcode_settings._SdkRoot(configuration) if not sdk_root: sdk_root = xcode_settings._XcodeSdkPath('') + if sdk_root is None: + sdk_root = '' env['SDKROOT'] = sdk_root if not additional_settings: |