diff options
Diffstat (limited to 'src/engine/SCons/Builder.py')
| -rw-r--r-- | src/engine/SCons/Builder.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index a62d91d..46fe9cb 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -36,6 +36,7 @@ import string from Errors import UserError import SCons.Action +import SCons.Node import SCons.Node.FS import SCons.Util @@ -132,15 +133,15 @@ class BuilderBase: ret.append(f) return ret - tlist = SCons.Util.scons_str2nodes(adjustixes(target, - env.subst(self.prefix), - env.subst(self.suffix)), - self.node_factory) + tlist = SCons.Node.arg2nodes(adjustixes(target, + env.subst(self.prefix), + env.subst(self.suffix)), + self.node_factory) - slist = SCons.Util.scons_str2nodes(adjustixes(source, - None, - env.subst(self.src_suffix)), - self.node_factory) + slist = SCons.Node.arg2nodes(adjustixes(source, + None, + env.subst(self.src_suffix)), + self.node_factory) return tlist, slist def __call__(self, env, target = None, source = None): @@ -248,7 +249,7 @@ class MultiStepBuilder(BuilderBase): self.src_builder = src_builder def __call__(self, env, target = None, source = None): - slist = SCons.Util.scons_str2nodes(source, self.node_factory) + slist = SCons.Node.arg2nodes(source, self.node_factory) final_sources = [] src_suffix = env.subst(self.src_suffix) sdict = {} |