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

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

Issue 10749020: Adds support for the library_dirs key, which appears in the documentation but was never actually im… (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
Index: pylib/gyp/generator/scons.py
===================================================================
--- pylib/gyp/generator/scons.py (revision 1429)
+++ pylib/gyp/generator/scons.py (working copy)
@@ -214,6 +214,7 @@
'CXXFLAGS' : 'cflags_cc',
'CPPDEFINES' : 'defines',
'CPPPATH' : 'include_dirs',
+ 'LIBPATH' : 'library_dirs',
# Add the ldflags value to $LINKFLAGS, but not $SHLINKFLAGS.
# SCons defines $SHLINKFLAGS to incorporate $LINKFLAGS, so
# listing both here would case 'ldflags' to get appended to
@@ -227,7 +228,7 @@
if value:
if gyp_var in ('defines',):
value = [EscapeCppDefine(v) for v in value]
- if gyp_var in ('include_dirs',):
+ if gyp_var in ('library_dirs', 'include_dirs',):
if src_dir and not src_dir.endswith('/'):
src_dir += '/'
result = []
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | pylib/gyp/generator/xcode.py » ('j') | pylib/gyp/input.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698