diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-02-10 09:27:52 +0900 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-08-24 15:46:40 -0400 |
| commit | 9ee8a14f9e12721b0b802f0bfb6ea292c28afe5a (patch) | |
| tree | afc32892e76ec2b5d971ee6cb1305b41bea3165f | |
| parent | a525c7244e1a3c3b454d19a40d4fbf213926c467 (diff) | |
| download | node-9ee8a14f9e12721b0b802f0bfb6ea292c28afe5a.tar.gz | |
deps: fix gyp to work on MacOSX without XCode
This is a port of nodejs/node@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>
PR-URL: https://github.com/joyent/node/pull/25857
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
| -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: |