diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-29 20:22:24 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-29 20:22:24 (GMT) |
| commit | c4fc0ad2e86ca03de81332cc984db0e0ccd98959 (patch) | |
| tree | a241e445694b160890d3b0bc3fc6f2db34549bda /src/engine | |
| parent | f067b35d278ddafcc4e48668f0eade10c71a69c0 (diff) | |
| download | SCons-c4fc0ad2e86ca03de81332cc984db0e0ccd98959.zip SCons-c4fc0ad2e86ca03de81332cc984db0e0ccd98959.tar.gz SCons-c4fc0ad2e86ca03de81332cc984db0e0ccd98959.tar.bz2 | |
Pull request # 234 (Bug #2840) code checkin. No tests yet
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 769b15d..52a592b 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -292,9 +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 = 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)) SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg) |