pylib/gyp/generator/ninja.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/generator/ninja.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: reland r1743 with fixed test case Created 7 years, 2 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/ninja.py

diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py

index 2d5b17c605971b1a0606a795e54008ee7f8d26f1..df4ed6a7d37cac7c193824b959a0c4613e740b64 100644

--- a/pylib/gyp/generator/ninja.py

+++ b/pylib/gyp/generator/ninja.py

@@ -1055,8 +1055,8 @@ class NinjaWriter:

if self.flavor == 'win':

library_dirs = [self.msvs_settings.ConvertVSMacros(l, config_name)

for l in library_dirs]

- library_dirs = [QuoteShellArgument('-LIBPATH:' + self.GypPathToNinja(l),

- self.flavor)

+ library_dirs = ['/LIBPATH:' + QuoteShellArgument(self.GypPathToNinja(l),

+ self.flavor)

for l in library_dirs]

else:

library_dirs = [QuoteShellArgument('-L' + self.GypPathToNinja(l),

« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | no next file with comments »