diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-02 12:38:15 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-02 14:12:34 +0300 |
| commit | c72b4e1b9c5973a0938aef3d0bf96c2240701d19 (patch) | |
| tree | 8f3c0b259e6a399f540d7d7bec00d96014fca0a7 | |
| parent | 3e23f36a3c17863b11d9311af204e486e63cac19 (diff) | |
| download | meson-c72b4e1b9c5973a0938aef3d0bf96c2240701d19.zip meson-c72b4e1b9c5973a0938aef3d0bf96c2240701d19.tar.gz meson-c72b4e1b9c5973a0938aef3d0bf96c2240701d19.tar.bz2 | |
Imported Debian fixes by Matthias Klose.
| -rw-r--r-- | cross/ubuntu-armhf.txt | 4 | ||||
| -rwxr-xr-x | run_tests.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt index 6246ffe..fec8ce7 100644 --- a/cross/ubuntu-armhf.txt +++ b/cross/ubuntu-armhf.txt @@ -1,8 +1,8 @@ [binaries] # we could set exe_wrapper = qemu-arm-static but to test the case # when cross compiled binaries can't be run we don't do that -c = '/usr/bin/arm-linux-gnueabihf-gcc-7' -cpp = '/usr/bin/arm-linux-gnueabihf-g++-7' +c = '/usr/bin/arm-linux-gnueabihf-gcc' +cpp = '/usr/bin/arm-linux-gnueabihf-g++' rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7'] ar = '/usr/arm-linux-gnueabihf/bin/ar' strip = '/usr/arm-linux-gnueabihf/bin/strip' diff --git a/run_tests.py b/run_tests.py index 1cc3983..648e6ce 100755 --- a/run_tests.py +++ b/run_tests.py @@ -131,7 +131,7 @@ def get_fake_options(prefix): return opts def should_run_linux_cross_tests(): - return shutil.which('arm-linux-gnueabihf-gcc-7') and not platform.machine().lower().startswith('arm') + return shutil.which('arm-linux-gnueabihf-gcc') and not platform.machine().lower().startswith('arm') def run_configure_inprocess(meson_command, commandlist): old_stdout = sys.stdout |