From 7b0c1e2349f044ba8979cf2430cb3ceb5c9c8cfd Mon Sep 17 00:00:00 2001 From: Peter Harris Date: Wed, 12 Aug 2020 21:09:54 -0400 Subject: find_library: include get_linker_always_args in link args The linker always args, as the name implies, should always be included. For example, the AIX get_allow_undefined_link_args are a syntax error unless the AIX get_linker_always_args are also used. --- mesonbuild/compilers/mixins/clike.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 95b9592..60468a1 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -1033,7 +1033,7 @@ class CLikeCompiler: if ((not extra_dirs and libtype is LibType.PREFER_SHARED) or libname in self.internal_libs): cargs = ['-l' + libname] - largs = self.get_allow_undefined_link_args() + largs = self.get_linker_always_args() + self.get_allow_undefined_link_args() extra_args = cargs + self.linker_to_compiler_args(largs) if self.links(code, env, extra_args=extra_args, disable_cache=True)[0]: -- cgit v1.1