aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakise-homura <akemi_homura@kurisa.ch>2019-04-19 18:02:01 +0300
committermakise-homura <akemi_homura@kurisa.ch>2019-04-19 18:02:01 +0300
commit54f9ec45104bd01c5679d4d1468ae96dec9e1fba (patch)
treec5f721fb432517c007e70426e7e119943827b890
parent2795f942bef680b0f050cc1f1001db26cab68bb9 (diff)
downloadmeson-54f9ec45104bd01c5679d4d1468ae96dec9e1fba.zip
meson-54f9ec45104bd01c5679d4d1468ae96dec9e1fba.tar.gz
meson-54f9ec45104bd01c5679d4d1468ae96dec9e1fba.tar.bz2
Fix concatenation of library dirs
-rw-r--r--mesonbuild/backend/ninjabackend.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 405bd26..08b14c8 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2418,7 +2418,7 @@ rule FORTRAN_DEP_HACK%s
guessed_dependencies = []
# TODO The get_library_naming requirement currently excludes link targets that use d or fortran as their main linker
if hasattr(linker, 'get_library_naming'):
- search_dirs = tuple(search_dirs) + linker.get_library_dirs(self.environment)
+ search_dirs = tuple(search_dirs) + tuple(linker.get_library_dirs(self.environment))
static_patterns = linker.get_library_naming(self.environment, LibType.STATIC, strict=True)
shared_patterns = linker.get_library_naming(self.environment, LibType.SHARED, strict=True)
for libname in libs: