diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-12 23:31:51 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-03-13 06:50:31 -0400 |
| commit | e54e9f58e5dce61573a96bdbef2bc3528566589e (patch) | |
| tree | 292c869595d8f8cb3708de6a3db8f45eb25f9e3d | |
| parent | 69ade4f4cf0123b7c38476b2972290d3d2a76b93 (diff) | |
| download | meson-e54e9f58e5dce61573a96bdbef2bc3528566589e.zip meson-e54e9f58e5dce61573a96bdbef2bc3528566589e.tar.gz meson-e54e9f58e5dce61573a96bdbef2bc3528566589e.tar.bz2 | |
give subproject interpreters a view of user defined options
We need this for the python module, as implemented in commit
e8375d20a9aeb8c3b0ad58f299ded0e5e978b447, but that then crashed in
subprojects because those options were never forwarded to the subproject
interpreter.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 27f4c69..b5e990a 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -907,7 +907,8 @@ external dependencies (including libraries) must go to "dependencies".''') with mlog.nested(subp_name): new_build = self.build.copy() subi = Interpreter(new_build, self.backend, subp_name, subdir, self.subproject_dir, - default_options, ast=ast, is_translated=is_translated) + default_options, ast=ast, is_translated=is_translated, + user_defined_options=self.user_defined_options) # Those lists are shared by all interpreters. That means that # even if the subproject fails, any modification that the subproject # made to those lists will affect the parent project. |