From 6f33fb67097beeb17e2345aaec3bda4a57b0b138 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Nov 2024 13:09:38 +0000 Subject: [PATCH] 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. Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/13934] Signed-off-by: Ross Burton --- mesonbuild/dependencies/dev.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 94f51ff69..cceb1756c 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 -- 2.34.1