diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:20:11 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-29 22:20:11 (GMT) |
| commit | 9794cbe901096e0835bd4db0958826ec9ed316f4 (patch) | |
| tree | 84986332440b88cb8b1237eec3611e41faeb48c0 /src | |
| parent | c4fc0ad2e86ca03de81332cc984db0e0ccd98959 (diff) | |
| download | SCons-9794cbe901096e0835bd4db0958826ec9ed316f4.zip SCons-9794cbe901096e0835bd4db0958826ec9ed316f4.tar.gz SCons-9794cbe901096e0835bd4db0958826ec9ed316f4.tar.bz2 | |
Revised pull request #234 fixing bug 2840. Andrew Featherstone had code changes, but no test
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Builder.py | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 47a3f97..e27f978 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,6 +18,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added new configure check, CheckProg, to check for existence of a program. + From Andrew Featherstone: + - Fix for issue #2840 - Fix for two environments specifying same target with different + actions not throwing hard error. Instead SCons was incorrectly issuing a warning + and continuing. + From Florian Miedniak: - Fixed tigris issue #3011: Glob() excludes didn't work when used with VariantDir(duplicate=0) diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 52a592b..c86012b 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -292,6 +292,7 @@ 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) |