diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-09 16:32:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-09 16:32:36 +0300 |
| commit | 8be84a4a7cb3ed81ef06c9d536ec7223150c9373 (patch) | |
| tree | b08673b41bb8a093158b95de349f49223dfe2862 | |
| parent | 572587f5cef0741cf68d5842d503ddb764e3d47b (diff) | |
| download | meson-8be84a4a7cb3ed81ef06c9d536ec7223150c9373.zip meson-8be84a4a7cb3ed81ef06c9d536ec7223150c9373.tar.gz meson-8be84a4a7cb3ed81ef06c9d536ec7223150c9373.tar.bz2 | |
Some more cross tweaking.
| -rw-r--r-- | cross/ubuntu-mingw.txt | 2 | ||||
| -rwxr-xr-x | meson_test.py | 2 |
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: |