summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2015-06-29 16:00:08 +1000
committerMartin Schwenke <martins@samba.org>2015-06-30 09:44:10 +0200
commit497432211966ce05d5b88df307d0d6071a4252ac (patch)
tree48f13127fd4b47a6e606d1df045aee7fbc5da3e8 /buildtools
parenteaf99203093cabc3069f1c69345d38d739b0663d (diff)
downloadsamba-497432211966ce05d5b88df307d0d6071a4252ac.tar.gz
wafsamba: Cache final_libs for each target
The code for saving/loading dependencies does not cache final_libs for each target. If wafsamba tries to reuse the saved dependencies, then it does not get the dependencies on the private libraries correctly. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> Autobuild-User(master): Martin Schwenke <martins@samba.org> Autobuild-Date(master): Tue Jun 30 09:44:10 CEST 2015 on sn-devel-104
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_deps.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 3be99565a66..d252dc4eef8 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -964,7 +964,8 @@ savedeps_version = 3
savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags',
'source', 'grouping_library', 'samba_ldflags', 'allow_undefined_symbols',
'use_global_deps', 'global_include' ]
-savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags', 'ldflags', 'samba_deps_extended']
+savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes',
+ 'ccflags', 'ldflags', 'samba_deps_extended', 'final_libs']
savedeps_outenv = ['INC_PATHS']
savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES', 'EXTRA_CFLAGS', 'EXTRA_LDFLAGS', 'EXTRA_INCLUDES' ]
savedeps_caches = ['GLOBAL_DEPENDENCIES', 'TARGET_TYPE', 'INIT_FUNCTIONS', 'SYSLIB_DEPS']