diff options
| author | Stéphane Cerveau <scerveau@collabora.com> | 2020-03-02 13:10:27 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-03-02 19:09:31 +0530 |
| commit | cc4e9e79be54f59a09d8e5ca96c6a2946245a88d (patch) | |
| tree | de46c56e014f0a0c1827dfe7601eb379e4476e0e | |
| parent | 200738a3e6b48671aac2865c304dded96179e4ac (diff) | |
| download | meson-cc4e9e79be54f59a09d8e5ca96c6a2946245a88d.zip meson-cc4e9e79be54f59a09d8e5ca96c6a2946245a88d.tar.gz meson-cc4e9e79be54f59a09d8e5ca96c6a2946245a88d.tar.bz2 | |
coredata: init_builtins should always call libdir_cross_fixup
As the interpreter reinitialize the coredate builtins, need to call
again libdir_cross_fixup
| -rw-r--r-- | mesonbuild/coredata.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index f1ce578..521d149 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: |