diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-23 18:46:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 18:46:40 +0200 |
| commit | cc4a9bcf35eafb56a48545b700b064c2231d48f2 (patch) | |
| tree | ccc17381b0368b2c0ace11c7d1a864f0a1221e1e /mesonbuild/dependencies/dev.py | |
| parent | 562c50f229cfe0a28abdfc2c56360f5a82c83b57 (diff) | |
| parent | 9262236322140f0b2cb94a53baeb67188c247f59 (diff) | |
| download | meson-cc4a9bcf35eafb56a48545b700b064c2231d48f2.zip meson-cc4a9bcf35eafb56a48545b700b064c2231d48f2.tar.gz meson-cc4a9bcf35eafb56a48545b700b064c2231d48f2.tar.bz2 | |
Merge pull request #2516 from dcbaker/submit/llvm-fix-lib-path
LLVM: Don't add -L<system path> to link args
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -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.') |