diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-04 18:11:39 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-04 18:11:39 +0300 |
| commit | dee10c9151c7233d20e7e142ee9b7ac6f93a45e8 (patch) | |
| tree | 40d896dd867682b2970286826f25dd9911027464 /mesonbuild | |
| parent | 27bbf37cf016d138c287278272a058950f15e7db (diff) | |
| download | meson-dee10c9151c7233d20e7e142ee9b7ac6f93a45e8.zip meson-dee10c9151c7233d20e7e142ee9b7ac6f93a45e8.tar.gz meson-dee10c9151c7233d20e7e142ee9b7ac6f93a45e8.tar.bz2 | |
Revert "coredata: init_builtins should always call libdir_cross_fixup"
This reverts commit cc4e9e79be54f59a09d8e5ca96c6a2946245a88d.
Diffstat (limited to 'mesonbuild')
| -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 0b79084..c8061a7 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -385,6 +385,7 @@ 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]: @@ -510,7 +511,6 @@ 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: |