aboutsummaryrefslogtreecommitdiff
path: root/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-10-18 20:55:10 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-10-18 20:55:10 +0300
commitae06ca2afc58901d9d72f13f662701cf12281b51 (patch)
tree25421861a84584438b39a3972b62d7398ac5d99b /build.py
parent4a899f2d9becbd204e6f63dbf4fb7be921a1ce71 (diff)
downloadmeson-ae06ca2afc58901d9d72f13f662701cf12281b51.zip
meson-ae06ca2afc58901d9d72f13f662701cf12281b51.tar.gz
meson-ae06ca2afc58901d9d72f13f662701cf12281b51.tar.bz2
User options now do a full round trip.
Diffstat (limited to 'build.py')
-rw-r--r--build.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/build.py b/build.py
index 64ea6ac..e95020d 100644
--- a/build.py
+++ b/build.py
@@ -40,16 +40,6 @@ class Build:
self.static_cross_linker = None
self.configure_files = []
self.pot = []
- self.user_options = {}
-
- def merge_options(self, options):
- for (name, value) in options.items():
- if name not in self.user_options:
- self.user_options[name] = value
- else:
- oldval = self.user_options[name]
- if type(oldval) != type(value):
- self.user_options[name] = value
def add_compiler(self, compiler):
if len(self.compilers) == 0: