From: Michael Hanselmann Date: Fri, 22 Mar 2019 23:14:52 +0000 (+0100) Subject: waf: Simplify condition for undefined symbol detection X-Git-Tag: tdb-1.4.1~547 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47278bfaa6dec543be49c0d66a2418928356a4a3;p=thirdparty%2Fsamba.git waf: Simplify condition for undefined symbol detection There's no need to check for OpenBSD twice. Signed-off-by: Michael Hanselmann Reviewed-by: Andrew Bartlett Reviewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Tue Apr 2 17:28:40 UTC 2019 on sn-devel-144 --- diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index ee1fc231eb9..98ffdfea458 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -919,12 +919,11 @@ def SETUP_CONFIGURE_CACHE(conf, enable): @conf def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf): - # we don't want any libraries or modules to rely on runtime - # resolution of symbols if not sys.platform.startswith("openbsd"): + # we don't want any libraries or modules to rely on runtime + # resolution of symbols conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) - if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []: - if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): + if (conf.env.undefined_ignore_ldflags == [] and + conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])): conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] -