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

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

Issue 256020: Make scons 'loadable_module' output consistent with make output location... (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: '' Created 11 years, 3 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 | pylib/gyp/generator/scons.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/generator/make.py
===================================================================
--- pylib/gyp/generator/make.py (revision 673)
+++ pylib/gyp/generator/make.py (working copy)
@@ -601,9 +601,9 @@
output = None
target = spec['target_name']
if self.type == 'static_library':
- target = 'lib%s.a' % target
+ target = 'lib%s.a' % (target[:3] == 'lib' and [target[3:]] or [target])[0]
elif self.type in ('loadable_module', 'shared_library'):
- target = 'lib%s.so' % target
+ target = 'lib%s.so' % (target[:3] == 'lib' and [target[3:]] or [target])[0]
elif self.type == 'none':
target = '%s.stamp' % target
elif self.type == 'settings':
« no previous file with comments | « no previous file | pylib/gyp/generator/scons.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698