diff options
| author | Ross Burton <ross.burton@arm.com> | 2024-11-20 13:09:38 +0000 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-03-24 00:39:17 -0400 |
| commit | 17117c2732c33ebec39e3fec2ecd5a3515dc7d71 (patch) | |
| tree | 1af8ab7b1114d6710693ebb2d1f7a43641759ac7 /mesonbuild/dependencies/dev.py | |
| parent | 67a903bfd46658e11e18e0d41989de3c2d9b5082 (diff) | |
| download | meson-17117c2732c33ebec39e3fec2ecd5a3515dc7d71.tar.gz | |
dependencies/dev: prepend sysroot when searching for GTest sources
Don't hardcode paths in /usr when looking for the GTest sources, as in
cross-compile or other builds with a sysroot this will find the host
sources, not ones that we want to use in the sysroot.
Closes #12690.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 2725a7bb4..0c8886b81 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -56,7 +56,9 @@ class GTestDependencySystem(SystemDependency): def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None: super().__init__(name, environment, kwargs, language='cpp') self.main = kwargs.get('main', False) - self.src_dirs = ['/usr/src/gtest/src', '/usr/src/googletest/googletest/src'] + + sysroot = environment.properties[self.for_machine].get_sys_root() or '' + self.src_dirs = [sysroot + '/usr/src/gtest/src', sysroot + '/usr/src/googletest/googletest/src'] if not self._add_sub_dependency(threads_factory(environment, self.for_machine, {})): self.is_found = False return |