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

Unified Diff: pylib/gyp/generator/ninja.py

Issue 9014002: Let ninja/mac pass all gyp tests. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: '' Created 9 years 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
Index: pylib/gyp/generator/ninja.py
===================================================================
--- pylib/gyp/generator/ninja.py (revision 1111)
+++ pylib/gyp/generator/ninja.py (working copy)
@@ -555,6 +555,10 @@
'loadable_module': 'so',
'shared_library': 'so',
}
+ # TODO(thakis/jeremya): Remove once the mac path name computation is done
+ # by XcodeSettings.
+ if self.flavor == 'mac':
+ DEFAULT_EXTENSION['shared_library'] = 'dylib'
extension = spec.get('product_extension',
DEFAULT_EXTENSION.get(spec['type'], ''))
if extension:
@@ -597,6 +601,10 @@
if self.toolset != 'target':
libdir = 'lib/%s' % self.toolset
return os.path.join(libdir, filename)
+ # TODO(thakis/jeremya): Remove once the mac path name computation is done
+ # by XcodeSettings.
+ elif spec['type'] == 'static_library' and self.flavor == 'mac':
+ return filename
else:
return self.GypPathToUniqueOutput(filename, qualified=False)
« no previous file with comments | « gyptest.py ('k') | test/dependencies/gyptest-lib-only.py » ('j') | test/lib/TestGyp.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698