diff options
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index a60b2b7..13eb0c1 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -206,21 +206,14 @@ class Build: self.projects = {} self.targets: T.MutableMapping[str, 'Target'] = OrderedDict() self.run_target_names: T.Set[T.Tuple[str, str]] = set() - - 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.global_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachineDefaultable.default( + environment.is_cross_build(), {}, {}) + self.global_link_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachineDefaultable.default( + environment.is_cross_build(), {}, {}) + self.projects_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachineDefaultable.default( + environment.is_cross_build(), {}, {}) + self.projects_link_args: PerMachine[T.Dict[str, T.List[str]]] = PerMachineDefaultable.default( + environment.is_cross_build(), {}, {}) self.tests: T.List['Test'] = [] self.benchmarks: T.List['Test'] = [] self.headers: T.List[Headers] = [] @@ -243,10 +236,8 @@ class Build: # If we are doing a cross build we need two caches, if we're doing a # build == host compilation the both caches should point to the same place. - dependency_overrides: PerMachineDefaultable[T.Dict[T.Tuple, DependencyOverride]] = PerMachineDefaultable({}) - if environment.is_cross_build(): - dependency_overrides.host = {} - self.dependency_overrides = dependency_overrides.default_missing() + self.dependency_overrides: PerMachine[T.Dict[T.Tuple, DependencyOverride]] = PerMachineDefaultable.default( + environment.is_cross_build(), {}, {}) self.devenv: T.List[EnvironmentVariables] = [] def get_build_targets(self): |