Skip to content

Commit

Permalink
tools,gyp: don't force build actions with multiple outputs
Browse files Browse the repository at this point in the history
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.
(refack): AFAICT because `*.intermediate` files don't have build rules.

PR-URL: #23156
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
  • Loading branch information
refack committed Oct 2, 2018
1 parent 731a72f commit 5d8373a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools/gyp/pylib/gyp/generator/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -1758,8 +1758,10 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
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.
# (refack): AFAICT because `*.intermediate` files don't have build rules.
self.WriteLn('%s: %s' % (intermediate, ' '.join(inputs)))
actions.insert(0, '$(call do_cmd,touch)')

if actions:
Expand Down

0 comments on commit 5d8373a

Please sign in to comment.