aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2016-09-07 14:42:16 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2016-09-07 21:42:16 +0300
commitb6ee5725c2531fd94dd8c6e2a614a09f9d69795d (patch)
tree86b88e1c5b1690048f80c483f66cfff1beae07d5 /mesonbuild/interpreter.py
parent165f8a913d25cd0cc35639811235f19e15ad08ec (diff)
downloadmeson-b6ee5725c2531fd94dd8c6e2a614a09f9d69795d.zip
meson-b6ee5725c2531fd94dd8c6e2a614a09f9d69795d.tar.gz
meson-b6ee5725c2531fd94dd8c6e2a614a09f9d69795d.tar.bz2
Fix option initialization for win32 cross-compile. (#762)
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index a1ff257..0c53326 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1622,7 +1622,9 @@ class Interpreter():
if cross_comp is not None:
cross_comp.sanity_check(self.environment.get_scratch_dir(), self.environment)
self.coredata.cross_compilers[lang] = cross_comp
- new_options = comp.get_options()
+ new_options = cross_comp.get_options()
+ else:
+ new_options = comp.get_options()
optprefix = lang + '_'
for i in new_options:
if not i.startswith(optprefix):