diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-10-27 11:46:41 (GMT) |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-10-27 11:46:41 (GMT) |
commit | e7888b15628b09af093621825b78df5cbcead088 (patch) | |
tree | 5c5a4afd7998be0a26cf3eb5636f5c5274cbddfd /test/nonexistent.py | |
parent | 5c7cea447b7f3b7833fbf4db25d32afa255cf52e (diff) | |
download | SCons-e7888b15628b09af093621825b78df5cbcead088.zip SCons-e7888b15628b09af093621825b78df5cbcead088.tar.gz SCons-e7888b15628b09af093621825b78df5cbcead088.tar.bz2 |
Correctly fix bug #2903, failure to rebuild when linker options change.
The failure to rebuild when linker options change was introduced in
abded0675444, "Add library version support to Shared Lib builder",
between 2.2.0 and 2.3.0.
Turning ShlinkAction into a FunctionAction instead of a CommandAction
made it stop depending on $SHLINKCOM. Normally, a CommandAction calls
get_presig (Action.py:815) which removes $( ... $) and uses the rest
of that string (recursively fully substituted) as the contents to
hash.
FunctionActions only look at the body of the function, so that removed
the dependency on $SHLINKCOM altogether. Adding it back in the
varlist does this (Action.py:443):
for v in vl:
result.append(env.subst('${'+v+'}'))
so it deep-substitutes the whole thing, including all the $( ... $)
parts. (All varlist vars do this, not just in FunctionActions.)
What we really want is to depend on the value of env['SHLINKCOM']
in the way CommandActions do, i.e. without the $( ... $)
parts, definitely not the fully substituted version of it.
I'm pretty sure the ignored $(...$) parts should not ever be
included in the signature, so this change updates the varlist handling
code to work the way CommandActions always have.
This change also renames the test files to use the correct bug
number and updates the test.
Diffstat (limited to 'test/nonexistent.py')
0 files changed, 0 insertions, 0 deletions