From 8d60f377409bf3570bad4cc27a7fc6b2ca5818f0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 1 Sep 2020 07:13:16 -0400 Subject: [PATCH] ninjatool: use constant names for stamp files Numbering files according to rules causes confusion, because CUSTOM_COMMAND3.stamp from a previous build might represent completely different targets after Makefile.ninja is regenerated. As a result, the new targets are not rebuilt and compilation fails. Use the targets to build a SHA1 hash; the chances for collision are one in 2^24 even with a 12-character prefix of the hash. Signed-off-by: Paolo Bonzini --- scripts/ninjatool.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index ba6bd9a2a6..627a1cab45 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -34,6 +34,7 @@ import re import json import argparse +import hashlib import shutil @@ -51,6 +52,9 @@ def normpath(path, _slow_re=re.compile('/[./]')): normpath = os.path.normpath +def sha1_text(text): + return hashlib.sha1(text.encode()).hexdigest() + # ---- lexer and parser ---- PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" @@ -767,7 +771,6 @@ def __init__(self, output, parser, args): self.build_vars = defaultdict(lambda: dict()) self.rule_targets = defaultdict(lambda: list()) self.stamp_targets = defaultdict(lambda: list()) - self.num_stamp = defaultdict(lambda: 0) self.all_outs = set() self.all_ins = set() self.all_phony = set() @@ -903,8 +906,7 @@ def end_build(self, scope, out, iout, rule, in_, iin, orderdep): if len(out) == 1: stamp = out[0] + '.stamp' else: - stamp = '%s%d.stamp' %(rule, self.num_stamp[rule]) - self.num_stamp[rule] += 1 + stamp = '%s@%s.stamp' % (rule, sha1_text(targets)[0:11]) self.print('%s: %s; @:' % (targets, stamp)) self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, inputs, orderonly)) self.rule_targets[rule].append(stamp)