Skip to content

Commit

Permalink
deps: fix gyp to work on MacOSX without XCode
Browse files Browse the repository at this point in the history
This is a port of eb459c8 ,
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: #1325
  Reviewed-By: Fedor Indutny <fedor@indutny.com>
  Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

PR-URL: nodejs/node-v0.x-archive#25857
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
  • Loading branch information
Shigeki Ohtsu authored and joaocgreis committed Aug 24, 2015
1 parent a525c72 commit 9ee8a14
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/gyp/pylib/gyp/xcode_emulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9ee8a14

Please sign in to comment.