aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2015-09-19 16:24:33 +0200
committerThibault Saunier <tsaunier@gnome.org>2015-09-19 16:24:33 +0200
commitc24573483d9ba5ded394578d20bc805f2759c2c4 (patch)
tree39297b893a4038c385ef850fbdab357f314b7b3f /meson.py
parent5c5f8c781385d416748000dbdb6f74fa59382340 (diff)
downloadmeson-c24573483d9ba5ded394578d20bc805f2759c2c4.zip
meson-c24573483d9ba5ded394578d20bc805f2759c2c4.tar.gz
meson-c24573483d9ba5ded394578d20bc805f2759c2c4.tar.bz2
Do not use intr before it exists
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/meson.py b/meson.py
index da7b12f..1e80b9f 100755
--- a/meson.py
+++ b/meson.py
@@ -144,9 +144,6 @@ itself as required.'''
else:
mlog.log('Build type:', mlog.bold('native build'))
b = build.Build(env)
- if env.is_cross_build():
- mlog.log('Host machine cpu:', mlog.bold(intr.builtin['host_machine'].cpu_method([], {})))
- mlog.log('Target machine cpu:', mlog.bold(intr.builtin['target_machine'].cpu_method([], {})))
if self.options.backend == 'ninja':
import ninjabackend
g = ninjabackend.NinjaBackend(b)
@@ -158,7 +155,11 @@ itself as required.'''
g = xcodebackend.XCodeBackend(b)
else:
raise RuntimeError('Unknown backend "%s".' % self.options.backend)
+
intr = interpreter.Interpreter(b, g)
+ if env.is_cross_build():
+ mlog.log('Host machine cpu:', mlog.bold(intr.builtin['host_machine'].cpu_method([], {})))
+ mlog.log('Target machine cpu:', mlog.bold(intr.builtin['target_machine'].cpu_method([], {})))
mlog.log('Build machine cpu:', mlog.bold(intr.builtin['build_machine'].cpu_method([], {})))
intr.run()
g.generate(intr)