summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-06-20 10:57:06 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-06-20 10:57:06 +0530
commit3675a6ac2c4adf36ad575fb686a6d71c8378d4a8 (patch)
treee57f7b43224cad4ace3d8fa9465c4add42417b7d
parent56faa2d3dacf367bd5283de2103287a711d6885a (diff)
downloadmeson-nirbheek/dependency-compiler-clib.tar.gz
pkgconfig dep: Special-case D link argumentsnirbheek/dependency-compiler-clib
The D compiler does not implement find_library(), so we can't resolve these libraries to absolute paths. Keep the old behaviour till that can be done.
-rw-r--r--mesonbuild/dependencies/base.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 3e6ecc51c..151d2b9d8 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -602,7 +602,10 @@ class PkgConfigDependency(ExternalDependency):
# Libraries that are provided by the toolchain or are not found by
# find_library() will be added with -L -l pairs.
for lib in self._convert_mingw_paths(shlex.split(out)):
- if lib.startswith('-L'):
+ if lib.startswith(('-L-l', '-L-L')):
+ # These are D language arguments, add them as-is
+ pass
+ elif lib.startswith('-L'):
libpaths.add(lib[2:])
continue
elif lib.startswith('-l'):
@@ -610,7 +613,8 @@ class PkgConfigDependency(ExternalDependency):
args = self.clib_compiler.find_library(lib[2:], self.env,
list(libpaths), libtype)
# If the project only uses a non-clib language such as D, Rust,
- # C#, Python, etc, all we can do is limp along.
+ # C#, Python, etc, all we can do is limp along by adding the
+ # arguments as-is and then adding the libpaths at the end.
else:
args = None
if args: