aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cross/ubuntu-mingw.txt2
-rwxr-xr-xmeson_test.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt
index 7e848ac..76a15a8 100644
--- a/cross/ubuntu-mingw.txt
+++ b/cross/ubuntu-mingw.txt
@@ -1,7 +1,7 @@
name = 'windows'
exe_wrapper = 'wine' # A command used to run generated executables.
c = '/usr/bin/i686-w64-mingw32-gcc'
-cpp = '/usr/bin/i686-w64-mingw32-gcc'
+cpp = '/usr/bin/i686-w64-mingw32-g++'
ar = '/usr/bin/i686-w64-mingw32-ar'
strip = '/usr/bin/i686-w64-mingw32-strip'
diff --git a/meson_test.py b/meson_test.py
index 2807dde..71a577e 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -70,7 +70,7 @@ def run_single_test(wrap, test):
global tests_failed
if test.fname[0].endswith('.jar'):
cmd = ['java', '-jar'] + test.fname
- elif run_with_mono(test.fname[0]):
+ elif not test.is_cross and run_with_mono(test.fname[0]):
cmd = ['mono'] + test.fname
else:
if test.is_cross: