Skip to content

Commit

Permalink
Revert "tools,gyp: don't force build actions with multiple outputs"
Browse files Browse the repository at this point in the history
This reverts commit 5d8373a.

Fixes: #23255

PR-URL: #23257
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
thefourtheye authored and addaleax committed Oct 4, 2018
1 parent 92fa0fc commit 17a0cd2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tools/gyp/pylib/gyp/generator/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -1758,10 +1758,8 @@ 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))
# 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)))
self.WriteLn('%s: %s%s' %
(intermediate, ' '.join(inputs), force_append))
actions.insert(0, '$(call do_cmd,touch)')

if actions:
Expand Down

0 comments on commit 17a0cd2

Please sign in to comment.