aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Redelings <benjamin.redelings@gmail.com>2017-12-30 10:51:50 -0800
committerBenjamin Redelings <benjamin.redelings@gmail.com>2018-01-01 22:42:49 -0800
commit1043b0b4a2f63ec0f8dded73afbcdfeb26143909 (patch)
tree3868d435da5f76d4336a665a09e4ea3edee4b946
parentc62078dae5c2dbecabdd99b905cdf561b5cc22e9 (diff)
downloadmeson-1043b0b4a2f63ec0f8dded73afbcdfeb26143909.zip
meson-1043b0b4a2f63ec0f8dded73afbcdfeb26143909.tar.gz
meson-1043b0b4a2f63ec0f8dded73afbcdfeb26143909.tar.bz2
Factor out extra linker search dirs into new function.
-rw-r--r--mesonbuild/dependencies/misc.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 38f7a82..08afcd6 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -390,14 +390,20 @@ class BoostDependency(ExternalDependency):
args += self.lib_modules['boost_' + lib]
return args
+ def extra_lib_dirs(self):
+ dirs = []
+ if self.boost_root:
+ dirs= [ os.path.join(self.boost_root, 'lib')]
+ elif self.libdir:
+ dirs = [ self.libdir ]
+ return dirs
+
def get_link_args(self):
if mesonlib.is_windows():
return self.get_win_link_args()
args = []
- if self.boost_root:
- args.append('-L' + os.path.join(self.boost_root, 'lib'))
- elif self.libdir:
- args.append('-L' + self.libdir)
+ for dir in self.extra_lib_dirs():
+ args += ['-L' + dir]
for lib in self.requested_modules:
args += self.lib_modules['boost_' + lib]
return args