From cc4e9e79be54f59a09d8e5ca96c6a2946245a88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Mon, 2 Mar 2020 13:10:27 +0100 Subject: [PATCH] coredata: init_builtins should always call libdir_cross_fixup As the interpreter reinitialize the coredate builtins, need to call again libdir_cross_fixup --- mesonbuild/coredata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index f1ce578c2..521d14952 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -381,7 +381,6 @@ class CoreData: # Only to print a warning if it changes between Meson invocations. self.config_files = self.__load_config_files(options, scratch_dir, 'native') self.init_builtins('') - self.libdir_cross_fixup() @staticmethod def __load_config_files(options: argparse.Namespace, scratch_dir: str, ftype: str) -> T.List[str]: @@ -507,6 +506,7 @@ class CoreData: for for_machine in iter(MachineChoice): for key, opt in builtin_options_per_machine.items(): self.add_builtin_option(self.builtins_per_machine[for_machine], key, opt, subproject) + self.libdir_cross_fixup() def add_builtin_option(self, opts_map, key, opt, subproject): if subproject: