diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/SConf.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index fb98cce..04444f2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -438,6 +438,8 @@ RELEASE 0.97 - XXX try:-except: blocks that catch all errors, which potentially catch and mask keyboard interrupts. + - Fix us of TargetSignatures('content') with the SConf subsystem. + From Russell Yanofsky: - Add support for the Metrowerks Codewarrior compiler and linker 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 |