diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-10-06 11:52:36 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-10-21 10:36:00 -0700 |
| commit | 9262236322140f0b2cb94a53baeb67188c247f59 (patch) | |
| tree | e52b935a5db202e39dfd54ceb0e8e436a513e2b4 | |
| parent | 4e394b3341b2d30294a14b96b7e528b441b675a5 (diff) | |
| download | meson-9262236322140f0b2cb94a53baeb67188c247f59.zip meson-9262236322140f0b2cb94a53baeb67188c247f59.tar.gz meson-9262236322140f0b2cb94a53baeb67188c247f59.tar.bz2 | |
llvm: strip system libraries from link arguments
v2: - use clang and gcc's -print-system-libs option as suggested by
Daniel Stone.
Fixes #2437
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index b0e54c6..308ae55 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -23,6 +23,7 @@ from .. import mlog from .. import mesonlib from ..mesonlib import version_compare, Popen_safe, stringlistify, extract_as_list from .base import DependencyException, ExternalDependency, PkgConfigDependency +from .base import strip_system_libdirs class GTestDependency(ExternalDependency): def __init__(self, environment, kwargs): @@ -172,8 +173,7 @@ class LLVMDependency(ExternalDependency): [self.llvmconfig, '--libs', '--ldflags'])[:2] if p.returncode != 0: raise DependencyException('Could not generate libs for LLVM.') - self.link_args = shlex.split(out) - + self.link_args = strip_system_libdirs(environment, shlex.split(out)) p, out = Popen_safe([self.llvmconfig, '--cppflags'])[:2] if p.returncode != 0: raise DependencyException('Could not generate includedir for LLVM.') |