From 01611a66e268a3cda7938fe99456ed78f83c73b2 Mon Sep 17 00:00:00 2001 From: Goncalo Carvalho Date: Mon, 23 Oct 2017 17:20:39 +0100 Subject: [PATCH] Fix boost link cmd line when compiler.find_library returns None, self.request_modules doesn't have 'boost_' prefix but lib_modules is keyed on 'boost_*' --- mesonbuild/dependencies/misc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 81bcdcb25..a24c873a9 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -359,11 +359,12 @@ class BoostDependency(ExternalDependency): args.append('-L' + self.libdir) for lib in self.requested_modules: # The compiler's library detector is the most reliable so use that first. - default_detect = self.compiler.find_library('boost_' + lib, self.env, []) + boost_lib = 'boost_' + lib + default_detect = self.compiler.find_library(boost_lib, self.env, []) if default_detect is not None: args += default_detect - elif lib in self.lib_modules: - linkcmd = '-l' + lib + elif boost_lib in self.lib_modules: + linkcmd = '-l' + boost_lib args.append(linkcmd) return args