pylib/gyp/generator/make.py - Issue 10854195: fix link deadlock

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

Issue 10854195: fix link deadlock (Closed) Base URL: https://gyp.googlecode.com/svn/trunk

Patch Set: Created 8 years, 4 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:

Index: pylib/gyp/generator/make.py

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

index 2cb3331ba32bf5fb9ba60fc16a9ad58a0e224330..edb2c5cff996c235b967b7715c27da5e7541c847 100644

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

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

@@ -2014,7 +2014,7 @@ def GenerateOutput(target_list, target_dicts, data, params):

for key, value in make_global_settings_array:

if value[0] != '$':

value = '$(abspath %s)' % value

- if key in ('LINK', 'LINK.host'):

+ if key == 'LINK':

make_global_settings += ('%s ?= %s $(builddir)/linker.lock %s\n' %

(key, flock_command, value))

elif key in ('CC', 'CC.host', 'CXX', 'CXX.host'):

« no previous file with comments | « no previous file | no next file » | no next file with comments »