diff options
| author | Sakthipriyan Vairamani (thefourtheye) <thechargingvolcano@gmail.com> | 2018-10-04 12:19:24 +0530 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-10-04 08:53:49 -0700 |
| commit | 17a0cd2bab405bbaaf890aa52043b273d61db3d8 (patch) | |
| tree | 31eb5456c3c036b4536a18e9d1de6cb6ae6a2bff /tools | |
| parent | 92fa0fcdb76e2b6cb0040eede97fe3c167c31897 (diff) | |
| download | node-new-17a0cd2bab405bbaaf890aa52043b273d61db3d8.tar.gz | |
Revert "tools,gyp: don't force build actions with multiple outputs"
This reverts commit 5d8373a498a50b1387464391402ef22636439303.
Fixes: https://github.com/nodejs/node/issues/23255
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 585dee4bd8..e98d93ab23 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -1758,10 +1758,8 @@ $(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)) - # 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: |