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/environment.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/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index fb1e070..a859bad 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -386,15 +386,6 @@ class Environment: previous_is_plaind = i == '-D' return False - def merge_options(self, options): - for (name, value) in options.items(): - if name not in self.coredata.user_options: - self.coredata.user_options[name] = value - else: - oldval = self.coredata.user_options[name] - if type(oldval) != type(value): - self.coredata.user_options[name] = value - @staticmethod def get_gnu_compiler_defines(compiler): """ |