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-06-30 13:40:40 +0200
commit58e914f9bc866fe424aa38b5e9ac42e6216d5f30 (patch)
treea2ecea108e81db88001244e82a87021dc7022b1d /tools/gyp
parent99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a (diff)
downloadandroid-node-v8-58e914f9bc866fe424aa38b5e9ac42e6216d5f30.tar.gz
android-node-v8-58e914f9bc866fe424aa38b5e9ac42e6216d5f30.tar.bz2
android-node-v8-58e914f9bc866fe424aa38b5e9ac42e6216d5f30.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 47f9d520e1..c002b112c5 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: