Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jenkins: add patch to work around 24966 #1671

Closed
wants to merge 1 commit into from
Closed

jenkins: add patch to work around 24966 #1671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions jenkins/scripts/coverage/24966-work-around.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
index e98d93a..bf08a5c 100644
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -1758,8 +1758,15 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
self.WriteLn('\t%s' % '@:')
self.WriteLn('%s: %s' % ('.INTERMEDIATE', intermediate))
- self.WriteLn('%s: %s%s' %
- (intermediate, ' '.join(inputs), force_append))
+ # Don't add `force_append` (FORCE_DO_CMD) to the intermediate sentinal.
+ # Adding it makes the action run alway, even when there are no changes.
+ # Excluding macOS which has a different way of resolving dependancies
+ # which can lead to deadlocks.
+ # (refack): AFAICT because `*.intermediate` files don't have build rules.
+ if self.flavor == 'mac':
+ self.WriteLn('%s: %s%s' % (intermediate, ' '.join(inputs), force_append))
+ else:
+ self.WriteLn('%s: %s' % (intermediate, ' '.join(inputs)))
actions.insert(0, '$(call do_cmd,touch)')

if actions:
~