summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-01-15 15:35:09 +0100
committerAlexander Bokovoy <ab@samba.org>2013-01-16 21:31:00 +0100
commit9ba44cc610426fb558b49aa9680b5bdf55c29082 (patch)
tree5c82fb3518fbfcb364a98165bb52df29da318798
parent46b6afc69baf89ba346e4418452b2d5a49b3e322 (diff)
downloadsamba-9ba44cc610426fb558b49aa9680b5bdf55c29082.tar.gz
samba-9ba44cc610426fb558b49aa9680b5bdf55c29082.tar.bz2
samba-9ba44cc610426fb558b49aa9680b5bdf55c29082.zip
build(waf): fix the abi_match for the pdb library
The global wildcard match is automatically added by the parsing code if the global match list is empty. Specifying an explicit '*' as the only global match lets the parsing code add a second '*' to the local list, which is an error tolerated on my linux by ld (the GNU linker), but not by the stricter GNU ELF linker "gold". Pair-Programmed-With: Gregor Beck <gbeck@sernet.de> Signed-off-by: Gregor Beck <gbeck@sernet.de> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Alexander Bokovoy <ab@samba.org> Autobuild-Date(master): Wed Jan 16 21:31:00 CET 2013 on sn-devel-104
-rwxr-xr-xsource3/wscript_build2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 107587d0bc..2e530f56f4 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -731,7 +731,7 @@ bld.SAMBA3_LIBRARY('pdb',
include/passdb.h
passdb/machine_sid.h
passdb/lookup_sid.h''',
- abi_match=private_pdb_match + ['*'],
+ abi_match=private_pdb_match,
abi_directory='passdb/ABI',
vnum='0',
vars=locals())