aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-12-09 20:26:12 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-12-09 20:26:12 +0200
commit11c812769af05126732d65bf6bf6da97afd42b1c (patch)
tree9d69067617d75480653b1a25b5070c5d59192577 /meson.py
parent374ffe9f86024a6e579345276e1d1798ecf6404a (diff)
downloadmeson-11c812769af05126732d65bf6bf6da97afd42b1c.zip
meson-11c812769af05126732d65bf6bf6da97afd42b1c.tar.gz
meson-11c812769af05126732d65bf6bf6da97afd42b1c.tar.bz2
Can haz subproject options.
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/meson.py b/meson.py
index 4aa7b1c..d96dffc 100755
--- a/meson.py
+++ b/meson.py
@@ -17,7 +17,7 @@
from optparse import OptionParser
import sys, stat, traceback, pickle
import os.path
-import environment, interpreter, optinterpreter
+import environment, interpreter
import backends, build
import mlog, coredata
@@ -121,11 +121,6 @@ itself as required.'''
else:
mlog.log('Build type:', mlog.bold('native build'))
b = build.Build(env)
- option_file = os.path.join(self.source_dir, 'meson_options.txt')
- if os.path.exists(option_file):
- oi = optinterpreter.OptionInterpreter()
- oi.process(option_file)
- env.merge_options(oi.options)
intr = interpreter.Interpreter(b)
intr.run()
if options.backend == 'ninja':