diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-03-25 14:47:07 -0700 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-05-28 09:26:38 -0400 |
| commit | d2e7bdccd7d60f1d67f895b94e52fdb350acf9e3 (patch) | |
| tree | 0a6b019441f53541804c06ad9f9cfca8ea720634 | |
| parent | 76b98459accdbe8a12eb7c41cfac3fc907a62057 (diff) | |
| download | meson-d2e7bdccd7d60f1d67f895b94e52fdb350acf9e3.zip meson-d2e7bdccd7d60f1d67f895b94e52fdb350acf9e3.tar.gz meson-d2e7bdccd7d60f1d67f895b94e52fdb350acf9e3.tar.bz2 | |
build: Use a PerMachineDefaultable for (project|global)[_link]_args
| -rw-r--r-- | mesonbuild/build.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 7d1529a..a60b2b7 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -206,10 +206,21 @@ class Build: self.projects = {} self.targets: T.MutableMapping[str, 'Target'] = OrderedDict() self.run_target_names: T.Set[T.Tuple[str, str]] = set() - self.global_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachine({}, {}) - self.projects_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachine({}, {}) - self.global_link_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachine({}, {}) - self.projects_link_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachine({}, {}) + + global_args: PerMachineDefaultable[T.Dict[str, T.List[str]]] = PerMachineDefaultable({}) + global_link_args: PerMachineDefaultable[T.Dict[str, T.List[str]]] = PerMachineDefaultable({}) + project_args: PerMachineDefaultable[T.Dict[str, T.List[str]]] = PerMachineDefaultable({}) + project_link_args: PerMachineDefaultable[T.Dict[str, T.List[str]]] = PerMachineDefaultable({}) + if environment.is_cross_build(): + global_args.host = {} + global_link_args.host = {} + project_args.host = {} + project_link_args.host = {} + self.global_args = global_args.default_missing() + self.projects_args = project_args.default_missing() + self.global_link_args = global_link_args.default_missing() + self.projects_link_args = project_link_args.default_missing() + self.tests: T.List['Test'] = [] self.benchmarks: T.List['Test'] = [] self.headers: T.List[Headers] = [] |