diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Builder.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 33ef27a..ec8ac36 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -51,6 +51,9 @@ RELEASE 0.97 - XXX $RPCGEN, $RPCGENFLAGS, $RPCGENCLIENTFLAGS, $RPCGENHEADERFLAGS, $RPCGENSERVICEFLAGS, $RPCGENXDRFLAGS. + - Provide more info in the error message when a user tries to build + a target multiple ways. + From Christoph Wiedemann: - Add an Environment.SetDefault() method that only sets values if diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 47c9ad2..1f3c60d 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -311,7 +311,7 @@ def _init_nodes(builder, env, overrides, tlist, slist): elif isinstance(t.builder, ListBuilder) ^ isinstance(builder, ListBuilder): raise UserError, "Cannot build same target `%s' as singular and list"%str(t) elif t.sources != slist: - raise UserError, "Multiple ways to build the same target were specified for: %s" % str(t) + raise UserError, "Multiple ways to build the same target were specified for: %s (from %s and from %s)" % (str(t), map(str,t.sources), map(str,slist)) if builder.single_source: if len(slist) > 1: |