diff options
| author | Refael Ackermann <refack@gmail.com> | 2018-09-28 20:06:15 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2018-10-02 17:53:14 -0400 |
| commit | 5d8373a498a50b1387464391402ef22636439303 (patch) | |
| tree | acbca734d5106fb55883979fd9eded33f78b4900 | |
| parent | 731a72f3871cf177c683ee82d0a28523aa67d683 (diff) | |
| download | android-node-v8-5d8373a498a50b1387464391402ef22636439303.tar.gz android-node-v8-5d8373a498a50b1387464391402ef22636439303.tar.bz2 android-node-v8-5d8373a498a50b1387464391402ef22636439303.zip | |
tools,gyp: don't force build actions with multiple outputs
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: https://github.com/nodejs/node/pull/23156
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index e98d93ab23..585dee4bd8 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -1758,8 +1758,10 @@ $(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. + # (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: |