diff options
| author | Karol Herbst <git@karolherbst.de> | 2023-05-11 00:09:16 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2023-06-08 09:49:29 -0700 |
| commit | 8284be8139925475c358c07be62a082c0984ccbf (patch) | |
| tree | 13d4c68b627f4c2d0be1cb6a33ef1995e99c0fae /mesonbuild/dependencies/dev.py | |
| parent | f02e26877de7a38fce672db9709666ed85706d43 (diff) | |
| download | meson-8284be8139925475c358c07be62a082c0984ccbf.tar.gz | |
dependencies/llvm: strip default include dirs
Fixes an issue with rust.bindgen if a cmake LLVM dependency with the
system include_type is getting used as a dependency.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index a9b768b18..9c0349645 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -31,7 +31,7 @@ from mesonbuild.interpreterbase.decorators import FeatureDeprecated from .. import mesonlib, mlog from ..environment import get_llvm_tool_names from ..mesonlib import version_compare, version_compare_many, search_version, stringlistify, extract_as_list -from .base import DependencyException, DependencyMethods, detect_compiler, strip_system_libdirs, SystemDependency, ExternalDependency, DependencyTypeName +from .base import DependencyException, DependencyMethods, detect_compiler, strip_system_includedirs, strip_system_libdirs, SystemDependency, ExternalDependency, DependencyTypeName from .cmake import CMakeDependency from .configtool import ConfigToolDependency from .factory import DependencyFactory @@ -438,6 +438,7 @@ class LLVMDependencyCMake(CMakeDependency): defs = defs[0].split(' ') temp = ['-I' + x for x in inc_dirs] + defs self.compile_args += [x for x in temp if x not in self.compile_args] + self.compile_args = strip_system_includedirs(env, self.for_machine, self.compile_args) if not self._add_sub_dependency(threads_factory(env, self.for_machine, {})): self.is_found = False return |
