test/library_dirs/subdir/test.gyp - 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: test/library_dirs/subdir/test.gyp

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: test/library_dirs/subdir/test.gyp

diff --git a/test/library_dirs/subdir/test.gyp b/test/library_dirs/subdir/test.gyp

index f83d7f2bf1f8ff1bf3a51455f5528b8fe0475422..127dd541d488440bdc6cc0812c1f46654f282d13 100644

--- a/test/library_dirs/subdir/test.gyp

+++ b/test/library_dirs/subdir/test.gyp

@@ -51,17 +51,9 @@

'<(abs_path_to_secret_library_location)',

'link_settings': {

- 'conditions': [

- ['OS=="linux"', {

- 'libraries': [

- '-lmylib',

- ],

- }, { # else

- 'libraries': [

- '<(STATIC_LIB_PREFIX)mylib<(STATIC_LIB_SUFFIX)',

- ],

- }],

- ], # conditions

+ 'libraries': [

+ '-lmylib',

+ ],

« no previous file with comments | « test/library_dirs/gyptest-library-dirs.py ('k') | test/library_dirs/subdir/test-win.gyp » ('j') | no next file with comments »