aboutsummaryrefslogtreecommitdiff
path: root/meson.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 /meson.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 'meson.py')
-rwxr-xr-xmeson.py2
1 files changed, 1 insertions, 1 deletions
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':