summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Scanner/C.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-10-16 04:13:14 (GMT)
committerSteven Knight <knight@baldmt.com>2002-10-16 04:13:14 (GMT)
commitbd91e792df09aebec78f7972e17eab873dc71246 (patch)
tree5b544223c15435fac1669b7d0f2c978483cf61fa /src/engine/SCons/Scanner/C.py
parent3f747760055842fd7ea89770cc568761d5729117 (diff)
downloadSCons-bd91e792df09aebec78f7972e17eab873dc71246.zip
SCons-bd91e792df09aebec78f7972e17eab873dc71246.tar.gz
SCons-bd91e792df09aebec78f7972e17eab873dc71246.tar.bz2
Refactor Repository and BuildDir. (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Scanner/C.py')
-rw-r--r--src/engine/SCons/Scanner/C.py6
1 files changed, 1 insertions, 5 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 = ()