summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-02-10 09:27:52 +0900
committerBen Noordhuis <info@bnoordhuis.nl>2015-10-30 12:27:27 +0100
commitbe65f5f25074b35dccc84a9266bb81a94e756e8e (patch)
tree8209f9d9ab074574fd2efab84605e8cab5b70118 /tools/gyp
parent1d65b99d5de3078a450101a9166b4168fbcba6fb (diff)
downloadandroid-node-v8-be65f5f25074b35dccc84a9266bb81a94e756e8e.tar.gz
android-node-v8-be65f5f25074b35dccc84a9266bb81a94e756e8e.tar.bz2
android-node-v8-be65f5f25074b35dccc84a9266bb81a94e756e8e.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 5de9ac121d..407ead074b 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1495,6 +1495,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: