diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-06 23:21:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 23:21:37 +0300 |
| commit | ec8db6a1b53072a08674bf2b4301dee7ab3dd589 (patch) | |
| tree | 05d4ce55c00c98db68c3ca2070a92ad2a0887e57 /mesonbuild | |
| parent | 8ce4952890c9ed25ee471d811990eb1fc3fb13b1 (diff) | |
| parent | d61f7a1e849e953a5478cd0f1b93cd5b7f4193a2 (diff) | |
| download | meson-ec8db6a1b53072a08674bf2b4301dee7ab3dd589.zip meson-ec8db6a1b53072a08674bf2b4301dee7ab3dd589.tar.gz meson-ec8db6a1b53072a08674bf2b4301dee7ab3dd589.tar.bz2 | |
Merge pull request #7076 from mesonbuild/revertcrossfixup
Revert cross fixup
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 d3ca4f6..fcb13f6 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: |