summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-09-29 22:59:55 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-09-29 22:59:55 (GMT)
commitad861e81993614c2a43dab8fc29c5d0cbef0df9f (patch)
treeeaae01064ff2747fb6f11edef4e30633b80021d3 /src
parent7a02c48b0d3e29f4f24b0a3fec8fc566a131a66d (diff)
parent57c3cb3cda988dbcbccd62b9595d7a1a2c04c069 (diff)
downloadSCons-ad861e81993614c2a43dab8fc29c5d0cbef0df9f.zip
SCons-ad861e81993614c2a43dab8fc29c5d0cbef0df9f.tar.gz
SCons-ad861e81993614c2a43dab8fc29c5d0cbef0df9f.tar.bz2
merged from scons default
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Builder.py3
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)