summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-15 14:59:47 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-15 21:48:15 +1100
commit6f6aa5f775baae6c921ceb5b9ac4fb0bc790f697 (patch)
tree497bafd9c7e55be68c3fa6976caaec6e832aa2bc /buildtools
parentaf99f0a06714e56149bf2c6f801d28ae808cc34a (diff)
downloadsamba-6f6aa5f775baae6c921ceb5b9ac4fb0bc790f697.tar.gz
samba-6f6aa5f775baae6c921ceb5b9ac4fb0bc790f697.tar.bz2
samba-6f6aa5f775baae6c921ceb5b9ac4fb0bc790f697.zip
waf: fixed re-running of build rules
the addition of ldflags deps caused us to re-run the build rules every time.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_deps.py4
-rw-r--r--buildtools/wafsamba/wafsamba.py5
2 files changed, 5 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 0ea966033c..1f27026a85 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -81,7 +81,7 @@ def build_dependencies(self):
libs = self.final_syslibs.copy()
(ccflags, ldflags) = library_flags(self, list(libs))
- new_ldflags = getattr(self, 'ldflags', [])
+ new_ldflags = getattr(self, 'samba_ldflags', [])[:]
new_ldflags.extend(ldflags)
self.ldflags = new_ldflags
@@ -953,7 +953,7 @@ def show_object_duplicates(bld, tgt_list):
# this provides a way to save our dependency calculations between runs
savedeps_version = 3
savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags',
- 'source', 'grouping_library', 'ldflags']
+ 'source', 'grouping_library', 'samba_ldflags']
savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags', 'ldflags', 'samba_deps_extended']
savedeps_outenv = ['INC_PATHS']
savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES', 'EXTRA_CFLAGS', 'EXTRA_LDFLAGS' ]
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7758affc49..19ebe23b60 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -226,7 +226,7 @@ def SAMBA_LIBRARY(bld, libname, source,
source = [],
target = bundled_name,
depends_on = depends_on,
- ldflags = ldflags,
+ samba_ldflags = ldflags,
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
@@ -338,7 +338,8 @@ def SAMBA_BINARY(bld, binname, source,
samba_subsystem= subsystem_name,
install_path = None,
samba_inst_path= install_path,
- samba_install = install
+ samba_install = install,
+ samba_ldflags = TO_LIST(ldflags)
)
if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: