Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: pylib/gyp/xcode_emulation.py

Issue 10821053: ninja/mac: allow path-based specification of SDKROOT (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/xcode_emulation.py
===================================================================
--- pylib/gyp/xcode_emulation.py (revision 1439)
+++ pylib/gyp/xcode_emulation.py (working copy)
@@ -244,8 +244,9 @@
def _SdkPath(self):
sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx10.5')
if sdk_root.startswith('macosx'):
- sdk_root = 'MacOSX' + sdk_root[len('macosx'):]
- return os.path.join(self._GetSdkBaseDir(), '%s.sdk' % sdk_root)
+ return os.path.join(self._GetSdkBaseDir(),
+ 'MacOSX' + sdk_root[len('macosx'):] + '.sdk')
+ return sdk_root
def GetCflags(self, configname):
"""Returns flags that need to be added to .c, .cc, .m, and .mm
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698