summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorZachary Tessler <ztessler@gmail.com>2017-10-06 14:56:05 (GMT)
committerZachary Tessler <ztessler@gmail.com>2017-10-06 15:01:03 (GMT)
commitfc19d103e3e80582fecf1594abfa68595a196d24 (patch)
treec395edacea6960f8fe13959b1e6184e64e462256 /src/engine
parent81c02354dfd7634708eb79547e9448150cc016a6 (diff)
downloadSCons-fc19d103e3e80582fecf1594abfa68595a196d24.zip
SCons-fc19d103e3e80582fecf1594abfa68595a196d24.tar.gz
SCons-fc19d103e3e80582fecf1594abfa68595a196d24.tar.bz2
Fix incorrect warning of different environments for a target when repeating identical builder or Command calls that use overrides
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Builder.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index afc2cf0..b5f1a92 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -291,7 +291,14 @@ def _node_errors(builder, env, tlist, slist):
if t.side_effect:
raise UserError("Multiple ways to build the same target were specified for: %s" % t)
if t.has_explicit_builder():
- if not t.env is None and not t.env is env:
+ # Check for errors when the environments are different
+ # No error if environments are the same Environment instance
+ if (not t.env is None and not t.env is env and
+ # Check OverrideEnvironment case - no error if wrapped Environments
+ # are the same instance, and overrides lists match
+ not (getattr(t.env, '__subject', 0) is getattr(env, '__subject', 1) and
+ getattr(t.env, 'overrides', 0) == getattr(env, 'overrides', 1) and
+ not builder.multi)):
action = t.builder.action
t_contents = t.builder.action.get_contents(tlist, slist, t.env)
contents = builder.action.get_contents(tlist, slist, env)