diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:27:53 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:27:53 (GMT) |
| commit | 1c54e91794852de54920529bd78603859ef2e10a (patch) | |
| tree | f65c6b8fd0911c0bece5bf16fa973fb5f0c88a25 | |
| parent | 9794cbe901096e0835bd4db0958826ec9ed316f4 (diff) | |
| parent | 6af468c642134c73c70820b17cad562c35785fdd (diff) | |
| download | SCons-1c54e91794852de54920529bd78603859ef2e10a.zip SCons-1c54e91794852de54920529bd78603859ef2e10a.tar.gz SCons-1c54e91794852de54920529bd78603859ef2e10a.tar.bz2 | |
Merged in ajf58/scons (pull request #234)
| -rw-r--r-- | src/engine/SCons/Builder.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index c86012b..b457d1e 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -292,10 +292,9 @@ 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 = 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)) SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg) |