Skip to contentSkip to conversation

ninjatool: rebuild multi-output targets if outputs are missing

PATCH New Paolo Bonzini 1 participant 1 message Sep 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ninjatool: rebuild multi-output targets if outputs are missing

The "stamp file trick" used to group targets of a single multi-output rule prevents the user from deleting one such target in order to force its rebuild. Doing so will not touch the stamp file, and therefore only the dummy ":" command will be executed.

With this patch, ninjatool writes rules that force-rebuild the stamp file if any of its outputs are missing. Rebuilding the missing target therefore causes the stamp file to be rebuilt too.

---
 scripts/ninjatool.py | 3 +++
 1 file changed, 3 insertions(+)
scripts/ninjatool.py +3 -0
index 627a1cab45..6f0e35c727 100755
@@ -908,6 +908,9 @@ class Ninja2Make(NinjaParserEventsWithVars):
             else:
                 stamp = '%s@%s.stamp' % (rule, sha1_text(targets)[0:11])
             self.print('%s: %s; @:' % (targets, stamp))
+            self.print('ifneq (%s, $(wildcard %s))' % (targets, targets))
+            self.print('.PHONY: %s' % (stamp, ))
+            self.print('endif')
             self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, inputs, orderonly))
             self.rule_targets[rule].append(stamp)
             self.stamp_targets[rule].append(stamp)
Signature · 1 line
2.26.2