diff options
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/C.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/Fortran.py | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py index d12fd45..47b6ea7 100644 --- a/src/engine/SCons/Scanner/C.py +++ b/src/engine/SCons/Scanner/C.py @@ -79,12 +79,8 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs): # node.includes - the result of include_re.findall() if not hasattr(target, 'cpppath'): - def Dir(rep, path, dir=target.cwd, fs=fs): - if rep: - path = os.path.join(rep, path) - return fs.Dir(path, dir) try: - target.cpppath = tuple(fs.Rsearchall(env['CPPPATH'], Dir)) + target.cpppath = tuple(fs.Rsearchall(SCons.Util.mapPaths(env['CPPPATH'], target.cwd), clazz=SCons.Node.FS.Dir)) except KeyError: target.cpppath = () diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py index 5e0d6d3..fd8c971 100644 --- a/src/engine/SCons/Scanner/Fortran.py +++ b/src/engine/SCons/Scanner/Fortran.py @@ -77,12 +77,8 @@ def scan(node, env, target, fs = SCons.Node.FS.default_fs): # node.includes - the result of include_re.findall() if not hasattr(target, 'f77path'): - def Dir(rep, path, dir=target.cwd, fs=fs): - if rep: - path = os.path.join(rep, path) - return fs.Dir(path, dir) try: - target.f77path = tuple(fs.Rsearchall(env['F77PATH'], Dir)) + target.f77path = tuple(fs.Rsearchall(SCons.Util.mapPaths(env['F77PATH'], target.cwd), clazz=SCons.Node.FS.Dir)) except KeyError: target.f77path = () |