pylib/gyp/xcode_emulation.py - Issue 82763006: Fix gyptest-type-envvars.py for Xcode 5.0.0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pylib/gyp/xcode_emulation.py

Issue 82763006: Fix gyptest-type-envvars.py for Xcode 5.0.0 (Closed) Base URL: http://gyp.googlecode.com/svn/trunk

Patch Set: Remove debug Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: pylib/gyp/xcode_emulation.py

diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py

index 3fe8ed6c539d6ac6014040572f5f55b58ae4558f..8fd72b35ba494340d00830809878b3b5e91a205f 100644

--- a/pylib/gyp/xcode_emulation.py

+++ b/pylib/gyp/xcode_emulation.py

@@ -1321,6 +1321,11 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,

install_name_base = xcode_settings.GetInstallNameBase()

if install_name_base:

env['DYLIB_INSTALL_NAME_BASE'] = install_name_base

+ if XcodeVersion() >= '0500':

+ sdk_root = xcode_settings._SdkRoot(configuration)

+ if not sdk_root:

+ sdk_root = xcode_settings._XcodeSdkPath('')

+ env['SDKROOT'] = sdk_root

if not additional_settings:

additional_settings = {}