aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/c.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-02-20 13:33:19 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-20 19:26:51 +0200
commit8842839bb4c8dadaba1808535928ede7527d5b53 (patch)
tree86c88bb459b0ad5327a1a364841f5cc47938c0bd /mesonbuild/compilers/c.py
parent0c1c387703c04c8052161b7506c07f216329b232 (diff)
downloadmeson-8842839bb4c8dadaba1808535928ede7527d5b53.zip
meson-8842839bb4c8dadaba1808535928ede7527d5b53.tar.gz
meson-8842839bb4c8dadaba1808535928ede7527d5b53.tar.bz2
pkgconfig deps: Warn when a static library isn't found
A hard error makes this feature useless in most cases since a static library usually won't be found for every library, particularly system libraries like -lm. Instead, warn so the user can provide the static library if they wish. This feature will be expanded and made more extensible and more usable in the future. Closes https://github.com/mesonbuild/meson/issues/2785
Diffstat (limited to 'mesonbuild/compilers/c.py')
-rw-r--r--mesonbuild/compilers/c.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index a59b7d3..1c9b9b4 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -780,9 +780,12 @@ class CCompiler(Compiler):
args = ['-l' + libname]
if self.links(code, env, extra_args=args):
return args
+ # Ensure that we won't modify the list that was passed to us
+ extra_dirs = extra_dirs[:]
+ # Search in the system libraries too
+ extra_dirs += self.get_library_dirs()
# Not found or we want to use a specific libtype? Try to find the
# library file itself.
- extra_dirs += self.get_library_dirs()
prefixes, suffixes = self.get_library_naming(env, libtype)
# Triply-nested loop!
for d in extra_dirs: