summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-02-10 09:27:52 +0900
committerRefael Ackermann <refack@gmail.com>2017-04-18 13:22:34 -0400
commite7c3f4a97b1297f3404ffdb26a37a619850cd448 (patch)
tree485c80d72885262336b0715fd8f12feae77bc2a7 /tools/gyp
parent3a334b12807eae369d487e0dce594681661fdcc5 (diff)
downloadandroid-node-v8-e7c3f4a97b1297f3404ffdb26a37a619850cd448.tar.gz
android-node-v8-e7c3f4a97b1297f3404ffdb26a37a619850cd448.tar.bz2
android-node-v8-e7c3f4a97b1297f3404ffdb26a37a619850cd448.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 dba8e7699e..667c53695a 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1662,6 +1662,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: