diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-08 21:46:20 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-08 22:11:49 +1000 |
| commit | 4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5 (patch) | |
| tree | 8d32526234eecdb5187869ba4c0b6093047d5442 /buildtools/wafsamba/samba_deps.py | |
| parent | eb9b7d0363669574de8ec380089407890f15eac2 (diff) | |
| download | samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.tar.gz samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.tar.bz2 samba-4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5.zip | |
build: make the handling of relative paths a bit saner
This should fix a problem that Anatoliy has struck with the PIDL
rules. It also brings us much closer to a working build for a true out
of tree build (ie. with waf configure -b /tmp/build)
Diffstat (limited to 'buildtools/wafsamba/samba_deps.py')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index be77d2c611..c52275e813 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -240,7 +240,7 @@ def check_duplicate_sources(bld, tgt_list): for t in tgt_list: obj_sources = getattr(t, 'source', '') - tpath = os_path_relpath(t.path.abspath(bld.env), t.env['BUILD_DIRECTORY'] + '/default') + tpath = os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default') obj_sources = bld.SUBDIR(tpath, obj_sources) t.samba_source_set = set(TO_LIST(obj_sources)) |