diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 20:26:12 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 20:26:12 +0200 |
commit | 11c812769af05126732d65bf6bf6da97afd42b1c (patch) | |
tree | 9d69067617d75480653b1a25b5070c5d59192577 /meson.py | |
parent | 374ffe9f86024a6e579345276e1d1798ecf6404a (diff) | |
download | meson-11c812769af05126732d65bf6bf6da97afd42b1c.zip meson-11c812769af05126732d65bf6bf6da97afd42b1c.tar.gz meson-11c812769af05126732d65bf6bf6da97afd42b1c.tar.bz2 |
Can haz subproject options.
Diffstat (limited to 'meson.py')
-rwxr-xr-x | meson.py | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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': |