diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-03-22 20:19:24 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-03-29 16:10:28 -0400 |
| commit | e33ec88ac714b1d41cbfec28e80ee6bc046200eb (patch) | |
| tree | 46cf4447a8e2d9d3987cdf9729023dd9a75df01f /mesonbuild/interpreter | |
| parent | d93fe56e89a027ec8fec9ad9d8176c6d7ee98543 (diff) | |
| download | meson-e33ec88ac714b1d41cbfec28e80ee6bc046200eb.zip meson-e33ec88ac714b1d41cbfec28e80ee6bc046200eb.tar.gz meson-e33ec88ac714b1d41cbfec28e80ee6bc046200eb.tar.bz2 | |
Pass environment down to base Target class
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 815737c..9b84231 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1763,6 +1763,7 @@ external dependencies (including libraries) must go to "dependencies".''') kwargs['output'][0], self.subdir, self.subproject, + self.environment, self.environment.get_build_command() + ['--internal', 'vcstagger', @@ -1889,6 +1890,7 @@ external dependencies (including libraries) must go to "dependencies".''') name, self.subdir, self.subproject, + self.environment, command, inputs, kwargs['output'], @@ -1927,7 +1929,8 @@ external dependencies (including libraries) must go to "dependencies".''') if isinstance(all_args[0], str): all_args[0] = self.find_program_impl([all_args[0]]) name = args[0] - tg = build.RunTarget(name, all_args, kwargs['depends'], self.subdir, self.subproject, kwargs['env']) + tg = build.RunTarget(name, all_args, kwargs['depends'], self.subdir, self.subproject, self.environment, + kwargs['env']) self.add_target(name, tg) full_name = (self.subproject, name) assert full_name not in self.build.run_target_names @@ -1940,7 +1943,7 @@ external dependencies (including libraries) must go to "dependencies".''') def func_alias_target(self, node: mparser.BaseNode, args: T.Tuple[str, T.List[build.Target]], kwargs: 'TYPE_kwargs') -> build.AliasTarget: name, deps = args - tg = build.AliasTarget(name, deps, self.subdir, self.subproject) + tg = build.AliasTarget(name, deps, self.subdir, self.subproject, self.environment) self.add_target(name, tg) return tg |