summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-15 16:13:51 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:46 +1100
commitb31055189ad953e2055d99caff3f8490613b96b4 (patch)
tree71fa2eea1c2b012cf11be1f0c35a22aef6e549cc
parent433f68efaab8418f44cde29c6c857680719dda79 (diff)
downloadsamba-b31055189ad953e2055d99caff3f8490613b96b4.tar.gz
samba-b31055189ad953e2055d99caff3f8490613b96b4.tar.bz2
samba-b31055189ad953e2055d99caff3f8490613b96b4.zip
build: make ADD_LDFLAGS() returns the flags that were added
this will be used by the s3 top level build to work out how to undo the effects of -Wl,-no-undefined Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/samba_autoconf.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 299b380a1a..02b52df4b0 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -645,6 +645,8 @@ def ADD_CFLAGS(conf, flags, testflags=False):
def ADD_LDFLAGS(conf, flags, testflags=False):
'''add some LDFLAGS to the command line
optionally set testflags to ensure all the flags work
+
+ this will return the flags that are added, if any
'''
if testflags:
ok_flags=[]
@@ -655,7 +657,7 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
if not 'EXTRA_LDFLAGS' in conf.env:
conf.env['EXTRA_LDFLAGS'] = []
conf.env['EXTRA_LDFLAGS'].extend(TO_LIST(flags))
-
+ return flags
@conf