Skip to content

Commit

Permalink
mdist: Hoist leftover late import
Browse files Browse the repository at this point in the history
From 23d3b98, the meson command is exposed through a function.
Therefore, the caveat no longer applies.
  • Loading branch information
joukewitteveen committed Feb 3, 2024
1 parent cb54f0d commit db51dcf
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions mesonbuild/mdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from glob import glob
from pathlib import Path
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)
from mesonbuild.msetup import add_arguments as msetup_argparse
from mesonbuild.wrap import wrap
Expand Down Expand Up @@ -327,9 +327,6 @@ def run(options: argparse.Namespace) -> int:
b = build.load(options.wd)
need_vsenv = T.cast('bool', b.environment.coredata.get_option(OptionKey('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
bld_root = b.environment.build_dir
priv_dir = os.path.join(bld_root, 'meson-private')
Expand Down

0 comments on commit db51dcf

Please sign in to comment.