From ae06ca2afc58901d9d72f13f662701cf12281b51 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Fri, 18 Oct 2013 20:55:10 +0300
Subject: User options now do a full round trip.

---
 meson.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meson.py')

diff --git a/meson.py b/meson.py
index 9731d1d..4aa7b1c 100755
--- a/meson.py
+++ b/meson.py
@@ -125,7 +125,7 @@ itself as required.'''
         if os.path.exists(option_file):
             oi = optinterpreter.OptionInterpreter()
             oi.process(option_file)
-            b.merge_options(oi.options)
+            env.merge_options(oi.options)
         intr = interpreter.Interpreter(b)
         intr.run()
         if options.backend == 'ninja':
-- 
cgit v1.1