wafsamba: remove the need of BuildContext.bdir

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 542e682619cd506f66c5f9879219b7ba3fe31b1f..d6b7c0f88d6bd9262af3cc8b08265175f86e5d9c 100644 (file)
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -1011,14 +1011,14 @@ def save_samba_deps(bld, tgt_list):
         if tdeps != {}:
             denv.outenv[t.sname] = tdeps
 
-    depsfile = os.path.join(bld.bdir, "sambadeps")
+    depsfile = os.path.join(bld.cache_dir, "sambadeps")
     denv.store_fast(depsfile)
 
 
 
 def load_samba_deps(bld, tgt_list):
     '''load a previous set of build dependencies if possible'''
-    depsfile = os.path.join(bld.bldnode.abspath(), "sambadeps")
+    depsfile = os.path.join(bld.cache_dir, "sambadeps")
     denv = ConfigSet.ConfigSet()
     try:
         debug('deps: checking saved dependencies')

diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py
index 26441309d4f181cce8c59195be90827a05c1bf2e..f2a2ba7fb5d32cbdb39f0d7ce3dcb62c2919bfb7 100644 (file)
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -44,7 +44,6 @@ for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.Un
 def pre_build(self):
     self.cwdx = self.bldnode.parent
     self.cwd = self.cwdx.abspath()
-    self.bdir = self.bldnode.abspath()
     return Build.BuildContext.old_pre_build(self)
 Build.BuildContext.old_pre_build = Build.BuildContext.pre_build
 Build.BuildContext.pre_build = pre_build