From 0966776b363ac7a66a5d22c05d474e35e6994c68 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 17:41:42 +1100 Subject: waf: fixed the handling of -Wl,-no-undefined this flag was not being propogated to our link rules, so we were not in fact enforcing no undefined symbols in libraries. --- buildtools/wafsamba/samba_autoconf.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'buildtools/wafsamba/samba_autoconf.py') diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index dffc5f0bdb..8cab128595 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -457,6 +457,10 @@ def library_flags(conf, libs): extra_ldflags = TO_LIST(getattr(conf.env, 'LDFLAGS_%s' % lib.upper(), [])) ccflags.extend(extra_ccflags) ldflags.extend(extra_ldflags) + if 'EXTRA_LDFLAGS' in conf.env: + ldflags.extend(conf.env['EXTRA_LDFLAGS']) + ccflags = unique_list(ccflags) + ldflags = unique_list(ldflags) return (ccflags, ldflags) @@ -646,14 +650,6 @@ def CURRENT_CFLAGS(bld, target, cflags, hide_symbols=False): return ret -def CURRENT_LDFLAGS(bld, target, cflags, hide_symbols=False): - '''work out the current loader flags. local flags are added first''' - flags = CURRENT_CFLAGS(bld, target, cflags, hide_symbols=hide_symbols) - if 'EXTRA_LDFLAGS' in bld.env: - flags.extend(bld.env['EXTRA_LDFLAGS']) - return flags - - @conf def CHECK_CC_ENV(conf): """trim whitespaces from 'CC'. -- cgit