diff options
| author | Steven Knight <knight@baldmt.com> | 2002-08-08 18:22:55 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-08-08 18:22:55 (GMT) |
| commit | cf339c049d817d154d838b65808889720f589a04 (patch) | |
| tree | ae1ef876c89364096fd66d25bafbf0082ac508bb /src/engine/SCons/Scanner/C.py | |
| parent | 6a5f2b1ff1288ed43ef066b4fde76ef0e7354a56 (diff) | |
| download | SCons-cf339c049d817d154d838b65808889720f589a04.zip SCons-cf339c049d817d154d838b65808889720f589a04.tar.gz SCons-cf339c049d817d154d838b65808889720f589a04.tar.bz2 | |
Refactor the interface between Rsearch() and Rsearchall() and their supplied functions' arguments to keep the repository and dir path portions separate.
Diffstat (limited to 'src/engine/SCons/Scanner/C.py')
| -rw-r--r-- | src/engine/SCons/Scanner/C.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py index f388b63..f871551 100644 --- a/src/engine/SCons/Scanner/C.py +++ b/src/engine/SCons/Scanner/C.py @@ -79,7 +79,10 @@ 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(x, dir=target.cwd, fs=fs): return fs.Dir(x,dir) + 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)) except KeyError: |