From fc19d103e3e80582fecf1594abfa68595a196d24 Mon Sep 17 00:00:00 2001
From: Zachary Tessler <ztessler@gmail.com>
Date: Fri, 6 Oct 2017 10:56:05 -0400
Subject: Fix incorrect warning of different environments for a target when
 repeating identical builder or Command calls that use overrides

---
 src/CHANGES.txt             | 3 +++
 src/engine/SCons/Builder.py | 9 ++++++++-
 test/Builder/non-multi.py   | 5 +++++
 test/Command.py             | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a7ad6f2..c9faf86 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -26,6 +26,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       This was introduced by a pull request to allow recursive variable evaluations to yield a string
       such as "$( $( some stuff $) $)".
 
+  From Zachary Tessler:
+    - Fix incorrect warning for repeated identical builder calls that use overrides
+
 RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
 
 NOTE: This is a major release.  You should expect that some targets may rebuild when upgrading.
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)
diff --git a/test/Builder/non-multi.py b/test/Builder/non-multi.py
index 70e800c..baf0ed0 100644
--- a/test/Builder/non-multi.py
+++ b/test/Builder/non-multi.py
@@ -43,13 +43,18 @@ B = Builder(action=build, multi=0)
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'file7.out', source = 'file7.in')
 env.B(target = 'file7.out', source = 'file7.in')
+env.B(target = 'file8.out', source = 'file8.in', arg=1)
+env.B(target = 'file8.out', source = 'file8.in', arg=1)
 """)
 
 test.write('file7.in', 'file7.in\n')
+test.write('file8.in', 'file8.in\n')
 
 test.run(arguments='file7.out')
+test.run(arguments='file8.out')
 
 test.must_match('file7.out', "file7.in\n")
+test.must_match('file8.out', "file8.in\n")
 
 test.pass_test()
 
diff --git a/test/Command.py b/test/Command.py
index e6b9028..c36fb33 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -78,6 +78,8 @@ env.Command(target = 'f3.out', source = 'f3.in',
 Command(target = 'f4.out', source = 'sub', action = sub)
 env.Command(target = 'f5.out', source = 'f5.in', action = buildIt,
             XYZZY='XYZZY is set')
+env.Command(target = 'f5.out', source = 'f5.in', action = buildIt,
+            XYZZY='XYZZY is set')
 Command(target = 'f6.out', source = 'f6.in',
         action = r'%(_python_)s build.py f6.out f6.in')
 env.Command(target = 'f7.out', source = 'f7.in',
-- 
cgit v0.12