diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-21 13:12:21 -0500 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2021-01-27 09:00:54 -0500 |
commit | 633264984b4b2278491476a0997193ff4996b3a6 (patch) | |
tree | 3859bec183f89046511cb6d5aca75411cc0e1440 /mesonbuild/interpreter.py | |
parent | e4137ae3eca0c73e8c19ea84d9a203ddb065f0d8 (diff) | |
download | meson-633264984b4b2278491476a0997193ff4996b3a6.zip meson-633264984b4b2278491476a0997193ff4996b3a6.tar.gz meson-633264984b4b2278491476a0997193ff4996b3a6.tar.bz2 |
custom_target: Add env kwarg
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index f317652..be0309e 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2315,7 +2315,8 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'depfile', 'build_by_default', 'build_always_stale', - 'console'}, + 'console', + 'env'}, 'dependency': {'default_options', 'embed', 'fallback', @@ -3997,6 +3998,7 @@ external dependencies (including libraries) must go to "dependencies".''') raise SubdirDoneRequest() @stringArgs + @FeatureNewKwargs('custom_target', '0.57.0', ['env']) @FeatureNewKwargs('custom_target', '0.48.0', ['console']) @FeatureNewKwargs('custom_target', '0.47.0', ['install_mode', 'build_always_stale']) @FeatureNewKwargs('custom_target', '0.40.0', ['build_by_default']) @@ -4018,6 +4020,7 @@ external dependencies (including libraries) must go to "dependencies".''') except mesonlib.MesonException: mlog.warning('''Custom target input \'%s\' can\'t be converted to File object(s). This will become a hard error in the future.''' % kwargs['input'], location=self.current_node) + kwargs['env'] = self.unpack_env_kwarg(kwargs) tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs, backend=self.backend), self) self.add_target(name, tg.held_object) return tg |