Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mdist: Hoist leftover late import 

From 23d3b98, the meson command is exposed through a function.
Therefore, the caveat no longer applies.
This commit is contained in:
Jouke Witteveen 2024-02-02 16:23:21 +01:00
parent cb54f0d707
commit db51dcfa47
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/mdist.py
View File

@ -21,7 +21,7 @@ from dataclasses import dataclass
from glob import glob from glob import glob
from pathlib import Path from pathlib import Path
from mesonbuild.environment import detect_ninja from mesonbuild.environment import detect_ninja
from mesonbuild.mesonlib import (MesonException, RealPathAction, quiet_git, from mesonbuild.mesonlib import (MesonException, RealPathAction, get_meson_command, quiet_git,
windows_proof_rmtree, setup_vsenv, OptionKey) windows_proof_rmtree, setup_vsenv, OptionKey)
from mesonbuild.msetup import add_arguments as msetup_argparse from mesonbuild.msetup import add_arguments as msetup_argparse
from mesonbuild.wrap import wrap from mesonbuild.wrap import wrap
@ -327,9 +327,6 @@ def run(options: argparse.Namespace) -> int:
b = build.load(options.wd) b = build.load(options.wd)
need_vsenv = T.cast('bool', b.environment.coredata.get_option(OptionKey('vsenv'))) need_vsenv = T.cast('bool', b.environment.coredata.get_option(OptionKey('vsenv')))
setup_vsenv(need_vsenv) setup_vsenv(need_vsenv)
# This import must be load delayed, otherwise it will get the default
# value of None.
from mesonbuild.mesonlib import get_meson_command
src_root = b.environment.source_dir src_root = b.environment.source_dir
bld_root = b.environment.build_dir bld_root = b.environment.build_dir
priv_dir = os.path.join(bld_root, 'meson-private') priv_dir = os.path.join(bld_root, 'meson-private')