From db73b4a2c129eeb7dddcd2466f8b7b485d66c1d9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 25 Oct 2010 11:29:12 +1100 Subject: waf: moved the -Wl,-no-undefined flags to source4 and ldb moved it out of the general waf build as the s3 waf build cannot yet handle linking with -Wl,-no-undefined Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Mon Oct 25 01:12:15 UTC 2010 on sn-devel-104 --- buildtools/wafsamba/samba_autoconf.py | 2 -- source4/lib/ldb/wscript | 4 ++++ source4/wscript | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index ea2ef09806..34acfdd1a9 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -577,8 +577,6 @@ def SAMBA_CONFIG_H(conf, path=None): # we add these here to ensure that -Wstrict-prototypes is not set during configure conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k', testflags=True) - conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) - if Options.options.picky_developer: conf.ADD_CFLAGS('-Werror', testflags=True) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index fe468102d9..502d492713 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -60,6 +60,10 @@ def configure(conf): conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) + # we don't want any libraries or modules to rely on runtime + # resolution of symbols + conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + conf.SAMBA_CONFIG_H() def build(bld): diff --git a/source4/wscript b/source4/wscript index 10c53a3d21..c419c16af2 100644 --- a/source4/wscript +++ b/source4/wscript @@ -116,6 +116,10 @@ def configure(conf): conf.RECURSE('../pidl') conf.RECURSE('selftest') + # we don't want any libraries or modules to rely on runtime + # resolution of symbols + conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + # we don't want PYTHONDIR in config.h, as otherwise changing # --prefix causes a complete rebuild del(conf.env.defines['PYTHONDIR']) -- cgit