pylib/gyp/msvs_emulation.py - Issue 24792003: homogenize msvs and ninja library_dir and libraries settings for Windows

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/msvs_emulation.py

Issue 24792003: homogenize msvs and ninja library_dir and libraries settings for Windows (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master

Patch Set: only add .lib extension if it does not already exist Created 7 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

Index: pylib/gyp/msvs_emulation.py

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

index 3c9fe50a0b0c8dc2614c4ef9d5433782f2aa6a63..1782be3ef91008d3a362534120e1941a631dad84 100644

--- a/pylib/gyp/msvs_emulation.py

+++ b/pylib/gyp/msvs_emulation.py

@@ -202,7 +202,8 @@ class MsvsSettings(object):

def AdjustLibraries(self, libraries):

"""Strip -l from library if it's specified with that."""

- return [lib[2:] if lib.startswith('-l') else lib for lib in libraries]

+ libs = [lib[2:] if lib.startswith('-l') else lib for lib in libraries]

+ return [lib + '.lib' if not lib.endswith('.lib') else lib for lib in libs]

def _GetAndMunge(self, field, path, default, prefix, append, map):

« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/library_dirs/subdir/test.gyp » ('j') | test/library_dirs/subdir/test.gyp » ('J')