diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-11-30 15:38:52 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-04 12:15:41 -0800 |
| commit | b37f0cce2c9d94223caf5730af508c463e125457 (patch) | |
| tree | 31732ce7366f440ca7333b9fb9ad7dddcee3bd42 /mesonbuild/mconf.py | |
| parent | b25a423a645491e83112929f95c1bd9312458a9a (diff) | |
| download | meson-b37f0cce2c9d94223caf5730af508c463e125457.zip meson-b37f0cce2c9d94223caf5730af508c463e125457.tar.gz meson-b37f0cce2c9d94223caf5730af508c463e125457.tar.bz2 | |
movve insert_build_prefix to mconf
that's the only place it's used anyway.
Diffstat (limited to 'mesonbuild/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 46aac6e..24638eb 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -35,6 +35,12 @@ def make_lower_case(val: T.Any) -> T.Union[str, T.List[T.Any]]: # T.Any because else: return str(val) +def insert_build_prefix(k: str) -> str: + idx = k.find(':') + if idx < 0: + return 'build.' + k + return k[:idx + 1] + 'build.' + k[idx + 1:] + class ConfException(mesonlib.MesonException): pass @@ -203,7 +209,7 @@ class Conf: self.coredata.compiler_options.host.items()))) build_compiler_options = self.split_options_per_subproject( dict(self.coredata.flatten_lang_iterator( - (self.coredata.insert_build_prefix(k), o) + (insert_build_prefix(k), o) for k, o in self.coredata.compiler_options.build.items()))) project_options = self.split_options_per_subproject(self.coredata.user_options) show_build_options = self.default_values_only or self.build.environment.is_cross_build() @@ -212,7 +218,7 @@ class Conf: self.print_options('Core options', core_options['']) self.print_options('', self.coredata.builtins_per_machine.host) if show_build_options: - self.print_options('', {self.coredata.insert_build_prefix(k): o for k, o in self.coredata.builtins_per_machine.build.items()}) + self.print_options('', {insert_build_prefix(k): o for k, o in self.coredata.builtins_per_machine.build.items()}) self.print_options('Backend options', self.coredata.backend_options) self.print_options('Base options', self.coredata.base_options) self.print_options('Compiler options', host_compiler_options.get('', {})) |