diff options
| author | Andrew Featherstone <andrew.featherstone@cantab.net> | 2015-05-15 20:02:10 (GMT) |
|---|---|---|
| committer | Andrew Featherstone <andrew.featherstone@cantab.net> | 2015-05-15 20:02:10 (GMT) |
| commit | 6af468c642134c73c70820b17cad562c35785fdd (patch) | |
| tree | 213c007e1c73e3100902dc6805178e5f58499cc1 | |
| parent | 7ac97ed9d43883d1322dc1d3a775ccc6da049b26 (diff) | |
| download | SCons-6af468c642134c73c70820b17cad562c35785fdd.zip SCons-6af468c642134c73c70820b17cad562c35785fdd.tar.gz SCons-6af468c642134c73c70820b17cad562c35785fdd.tar.bz2 | |
Corrects comparison of actions from different environments.
| -rw-r--r-- | src/engine/SCons/Builder.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index c82f6ac..4e8aee9 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -292,8 +292,8 @@ def _node_errors(builder, env, tlist, slist): if t.has_explicit_builder(): if not t.env is None and not t.env is env: action = t.builder.action - t_contents = action.get_contents(tlist, slist, t.env) - contents = action.get_contents(tlist, slist, env) + t_contents = t.builder.action.get_contents(tlist, slist, t.env) + contents = builder.action.get_contents(tlist, slist, env) if t_contents == contents: msg = "Two different environments were specified for target %s,\n\tbut they appear to have the same action: %s" % (t, action.genstring(tlist, slist, t.env)) |