From 11c812769af05126732d65bf6bf6da97afd42b1c Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Mon, 9 Dec 2013 20:26:12 +0200
Subject: Can haz subproject options.

---
 meson.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'meson.py')

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':
-- 
cgit v1.1