diff options
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): """ |