From c6f5361d4995ee706e1656e823516b336b49af8c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 7 Jan 2015 09:56:56 +0100 Subject: [PATCH] wafsamba: move -fvisibility=hidden checks from lib/replace to wafsamba Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme (cherry picked from commit 4683fc0f1dc5af3bcf81edaebfbd6c8d3b38df9e) --- buildtools/wafsamba/wscript | 7 +++++++ lib/replace/wscript | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 0e2afe11490..0a1cd1ce3ea 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -341,6 +341,13 @@ def configure(conf): else: conf.env.HAVE_LD_VERSION_SCRIPT = False + if conf.CHECK_CFLAGS('-fvisibility=hidden'): + conf.env.VISIBILITY_CFLAGS = '-fvisibility=hidden' + conf.CHECK_CODE('''int main(void) { return 0; } + __attribute__((visibility("default"))) void vis_foo2(void) {}''', + cflags=conf.env.VISIBILITY_CFLAGS, + define='HAVE_VISIBILITY_ATTR', addmain=False) + if sys.platform.startswith('aix'): conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True) # Might not be needed if ALL_SOURCE is defined diff --git a/lib/replace/wscript b/lib/replace/wscript index 4693a79c49d..4d4d182b6f1 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -599,13 +599,6 @@ removeea setea execute=True, mandatory=True) # lets see if we get a mandatory failure for this one - if conf.CHECK_CFLAGS('-fvisibility=hidden'): - conf.env.VISIBILITY_CFLAGS = '-fvisibility=hidden' - conf.CHECK_CODE('''int main(void) { return 0; } - __attribute__((visibility("default"))) void vis_foo2(void) {}''', - cflags=conf.env.VISIBILITY_CFLAGS, - define='HAVE_VISIBILITY_ATTR', addmain=False) - # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: if conf.CHECK_CODE(''' -- 2.47.2