summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-02-10 09:27:52 +0900
committerShigeki Ohtsu <ohtsu@iij.ad.jp>2015-04-04 12:37:26 +0900
commiteb459c81512c2ce61ee488450fc2d4006cb63198 (patch)
tree34c44bb4d61f7fa9a4a7a5e153a7025e858c22bd /tools/gyp
parent15f058f6091d338cd26c76d47b19ad5bd21214ba (diff)
downloadandroid-node-v8-eb459c81512c2ce61ee488450fc2d4006cb63198.tar.gz
android-node-v8-eb459c81512c2ce61ee488450fc2d4006cb63198.tar.bz2
android-node-v8-eb459c81512c2ce61ee488450fc2d4006cb63198.zip
tools: fix gyp to work on MacOSX without XCode
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>
Diffstat (limited to 'tools/gyp')
-rw-r--r--tools/gyp/pylib/gyp/xcode_emulation.py2
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 72bb53a40d..f1a839a2f5 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1471,6 +1471,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: