diff options
| author | Steven Knight <knight@baldmt.com> | 2005-01-10 20:37:46 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-01-10 20:37:46 (GMT) |
| commit | 60452b0880d9f1eca5125677ca1414f73e6032a1 (patch) | |
| tree | f0211fec18330d436a82156d5ea3534009fa0dc3 /src/engine/SCons | |
| parent | 519037f42eb7c90c5fb1f7d2e2b41ccee5fdba86 (diff) | |
| download | SCons-60452b0880d9f1eca5125677ca1414f73e6032a1.zip SCons-60452b0880d9f1eca5125677ca1414f73e6032a1.tar.gz SCons-60452b0880d9f1eca5125677ca1414f73e6032a1.tar.bz2 | |
Fix use of TargetSignatures('content') with SConf. (Christoph Wiedemann)
Diffstat (limited to 'src/engine/SCons')
| -rw-r--r-- | src/engine/SCons/SConf.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index 6b96384..5572a01 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -250,9 +250,12 @@ class SConfBuildTask(SCons.Taskmaster.Task): if cache_mode == CACHE: t.state = SCons.Node.up_to_date else: - bsig = t.calc_signature(sconf_global.calc) - is_up_to_date = (is_up_to_date and - bsig == bi.bsig) + new_bsig = t.calc_signature(sconf_global.calc) + if t.env.use_build_signature(): + old_bsig = bi.bsig + else: + old_bsig = bi.csig + is_up_to_date = (is_up_to_date and new_bsig == old_bsig) cached_error = cached_error or bi.result else: # the node hasn't been built in a SConf context or doesn't |