Browse Source

deps: fix gyp to work on MacOSX without XCode

This is a port of eb459c8151 ,
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>

This was ported to v0.10 in https://github.com/joyent/node/pull/25857

PR-URL: https://github.com/nodejs/node/pull/2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
v0.12-staging
Shigeki Ohtsu 10 years ago
committed by João Reis
parent
commit
02c262a4c6
  1. 2
      tools/gyp/pylib/gyp/xcode_emulation.py

2
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) sdk_root = xcode_settings._SdkRoot(configuration)
if not sdk_root: if not sdk_root:
sdk_root = xcode_settings._XcodeSdkPath('') sdk_root = xcode_settings._XcodeSdkPath('')
if sdk_root is None:
sdk_root = ''
env['SDKROOT'] = sdk_root env['SDKROOT'] = sdk_root
if not additional_settings: if not additional_settings:

Loading…
Cancel
Save