Speed up and generalize SCons.Util.find_files().

2 files changed, 13 insertions, 5 deletions

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index 7396125..ab48342 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -66,8 +66,10 @@ def scan(filename, env, node_factory):
     dependencies.
     """
 
+    fs = SCons.Node.FS.default_fs
     try:
-        paths = env.Dictionary("CPPPATH")
+        paths = map(lambda x, dir=fs.Dir: dir(x),
+                    env.Dictionary("CPPPATH"))
     except KeyError:
         paths = []
 
@@ -79,11 +81,15 @@ def scan(filename, env, node_factory):
         angle_includes = angle_re.findall(contents)
         quote_includes = quote_re.findall(contents)
 
-        source_dir = os.path.dirname(filename)
+        dir = os.path.dirname(filename)
+        if dir:
+            source_dir = [fs.Dir(dir)]
+        else:
+            source_dir = []
         
-        return (SCons.Util.find_files(angle_includes, paths + [source_dir],
+        return (SCons.Util.find_files(angle_includes, paths + source_dir,
                                       node_factory)
-                + SCons.Util.find_files(quote_includes, [source_dir] + paths,
+                + SCons.Util.find_files(quote_includes, source_dir + paths,
                                         node_factory))
     except OSError:
         return []
diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py
index 0f8acff..cbbfb42 100644
--- a/src/engine/SCons/Scanner/Prog.py
+++ b/src/engine/SCons/Scanner/Prog.py
@@ -40,8 +40,10 @@ def scan(filename, env, node_factory):
     files it finds as dependencies.
     """
 
+    fs = SCons.Node.FS.default_fs
     try:
-        paths = env.Dictionary("LIBPATH")
+        paths = map(lambda x, dir=fs.Dir: dir(x),
+                    env.Dictionary("LIBPATH"))
     except KeyError:
         paths = []