diff options
| author | Steven Knight <knight@baldmt.com> | 2003-05-12 04:50:42 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-05-12 04:50:42 (GMT) |
| commit | f6ba11c5d37711d436bc1432878965fd3871eb57 (patch) | |
| tree | 1b2e4654691dc6f74e83bac46a373531f2f328b3 /src | |
| parent | 45cef3b045d2c7034f3886da630fb690db1b539a (diff) | |
| download | SCons-f6ba11c5d37711d436bc1432878965fd3871eb57.zip SCons-f6ba11c5d37711d436bc1432878965fd3871eb57.tar.gz SCons-f6ba11c5d37711d436bc1432878965fd3871eb57.tar.bz2 | |
Fix for the internal Link action not being reentrant when used with BuildDir.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d441604..e1d842c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -80,6 +80,9 @@ RELEASE 0.14 - XXX - Interpolate the null string if an out-of-range subscript is used for a construction variable. + - Fix the internal Link function so that it creates properly links or + copies of files in subsidiary BuildDir directories. + From Damyan Pepper: - Quote the "Entering directory" message like Make. diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 884736e..b4641a7 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -69,8 +69,8 @@ else: _existsp = os.path.exists def LinkFunc(target, source, env): - src = source[0].path - dest = target[0].path + src = str(source[0]) + dest = str(target[0]) dir, file = os.path.split(dest) if dir and not os.path.isdir(dir): os.makedirs(dir) |