summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2015-03-30 11:41:09 -0700
committerDavid Disseldorp <ddiss@samba.org>2015-03-31 04:32:52 +0200
commitbdf0a81006534348996a27207e0f712646bf39b5 (patch)
treedf5b105ab96dc1226d8c01d00ac108c18ae23103 /buildtools
parent48e90ba062ecde71d03c3cf4bc9a809f805fabe4 (diff)
downloadsamba-bdf0a81006534348996a27207e0f712646bf39b5.tar.gz
waf: Remove 'linkflags.remove(x)' line added in error.
Fixes bug #11165 - Bug in configure scripts when system-mitkrb5 is used https://bugzilla.samba.org/show_bug.cgi?id=11165 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org> Autobuild-User(master): David Disseldorp <ddiss@samba.org> Autobuild-Date(master): Tue Mar 31 04:32:52 CEST 2015 on sn-devel-104
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_conftests.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 1afc6c94fbe..96fead58128 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -565,7 +565,6 @@ def samba_config_c_parse_flags(line1, uselib, env):
# bugs in the real parse_flags() function.
#
if x == '-Wl,-rpath' or x == '-Wl,-R':
- linkflags.remove(x)
x = lst1.pop(0)
if x.startswith('-Wl,'):
rpath = x[4:]