diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-11-07 15:05:32 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2022-12-07 11:59:06 -0500 |
| commit | 2dbe976278b66e97bf600b3885d8eda4874f03cf (patch) | |
| tree | 97c32192f27054a01886b8dd2dbcfc787f290b0b | |
| parent | 548c9adad44ce88788356180fc2ec8e3665b3952 (diff) | |
| download | meson-2dbe976278b66e97bf600b3885d8eda4874f03cf.zip meson-2dbe976278b66e97bf600b3885d8eda4874f03cf.tar.gz meson-2dbe976278b66e97bf600b3885d8eda4874f03cf.tar.bz2 | |
devenv: Set QEMU_LD_PREFIX to sys_root
When the cross file has a sys_root, it is most probably needed to run
executables with qemu.
| -rw-r--r-- | mesonbuild/mdevenv.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index 4b3d783..b25d73b 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -6,7 +6,8 @@ import itertools from pathlib import Path from . import build, minstall, dependencies -from .mesonlib import MesonException, is_windows, setup_vsenv, OptionKey, get_wine_shortpath +from .mesonlib import (MesonException, is_windows, setup_vsenv, OptionKey, + get_wine_shortpath, MachineChoice) from . import mlog import typing as T @@ -52,6 +53,10 @@ def get_env(b: build.Build, dump: bool) -> T.Tuple[T.Dict[str, str], T.Set[str]] extra_env.set('MESON_DEVENV', ['1']) extra_env.set('MESON_PROJECT_NAME', [b.project_name]) + sysroot = b.environment.properties[MachineChoice.HOST].get_sys_root() + if sysroot: + extra_env.set('QEMU_LD_PREFIX', [sysroot]) + env = {} if dump else os.environ.copy() varnames = set() for i in itertools.chain(b.devenv, {extra_env}): |