diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-01-19 10:38:38 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-03-16 21:02:23 -0400 |
| commit | 72cd2a395a240f050b6225b9aed876ee214ecd8c (patch) | |
| tree | b95e7dd296d355638ab85926b8e4c75a5dfe333c /mesonbuild/mcompile.py | |
| parent | adb619db6110d14e8f56366dbc2ce271abc4558c (diff) | |
| download | meson-72cd2a395a240f050b6225b9aed876ee214ecd8c.zip meson-72cd2a395a240f050b6225b9aed876ee214ecd8c.tar.gz meson-72cd2a395a240f050b6225b9aed876ee214ecd8c.tar.bz2 | |
coredata: Do not pickle it twice
Exclude coredata from build.dat because it gets pickled separately
already.
Diffstat (limited to 'mesonbuild/mcompile.py')
| -rw-r--r-- | mesonbuild/mcompile.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py index e14f9e9..ce002bd 100644 --- a/mesonbuild/mcompile.py +++ b/mesonbuild/mcompile.py @@ -26,7 +26,6 @@ from pathlib import Path from . import mlog from . import mesonlib -from . import coredata from .mesonlib import MesonException, RealPathAction, join_args, setup_vsenv from mesonbuild.environment import detect_ninja from mesonbuild.coredata import UserArrayOption @@ -331,8 +330,8 @@ def run(options: 'argparse.Namespace') -> int: if options.targets and options.clean: raise MesonException('`TARGET` and `--clean` can\'t be used simultaneously') - cdata = coredata.load(options.wd) b = build.load(options.wd) + cdata = b.environment.coredata vsenv_active = setup_vsenv(b.need_vsenv) if vsenv_active: mlog.log(mlog.green('INFO:'), 'automatically activated MSVC compiler environment') |