diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-05-13 10:36:58 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-06 20:02:37 +0000 |
| commit | 8fb72510c3b7a7a5f08b4b20b7e1480f5868052a (patch) | |
| tree | d9131c527142bf6b6b2d28ad55d8f87fc34072eb /mesonbuild/interpreter.py | |
| parent | 3e6dc8fb71cec4e8f32ff4d76c18dcbb892e7221 (diff) | |
| download | meson-8fb72510c3b7a7a5f08b4b20b7e1480f5868052a.zip meson-8fb72510c3b7a7a5f08b4b20b7e1480f5868052a.tar.gz meson-8fb72510c3b7a7a5f08b4b20b7e1480f5868052a.tar.bz2 | |
Move to coredata some methods handling options
Those methods only use coredata object, so better just move them as a
coredata method.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c513823..320e543 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2306,7 +2306,7 @@ to directly access options of other subprojects.''') self.build.environment.cmd_line_options.projectoptions, ) oi.process(self.option_file) - self.build.environment.merge_options(oi.options) + self.coredata.merge_user_options(oi.options) self.set_backend() self.active_projectname = proj_name self.project_version = kwargs.get('version', 'undefined') |