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/mconf.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/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 35e862f..7182941 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -72,7 +72,7 @@ class Conf: if os.path.isdir(os.path.join(self.build_dir, 'meson-private')): self.build = build.load(self.build_dir) self.source_dir = self.build.environment.get_source_dir() - self.coredata = coredata.load(self.build_dir) + self.coredata = self.build.environment.coredata self.default_values_only = False elif os.path.isfile(os.path.join(self.build_dir, environment.build_filename)): # Make sure that log entries in other parts of meson don't interfere with the JSON output |