aboutsummaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-10-29 01:57:12 +0300
committerGitHub <noreply@github.com>2017-10-29 01:57:12 +0300
commit57d3ece5fc4e883fe3d069be7cd207fee8fffa90 (patch)
tree5c305b1466a0e011f020b4d29c7fdf96f7864970 /cross
parent1a159db8e90fa6b9571a06768d6f1ba08074e819 (diff)
parente292369ee20ed84337a52832d765ca544513dba3 (diff)
downloadmeson-57d3ece5fc4e883fe3d069be7cd207fee8fffa90.zip
meson-57d3ece5fc4e883fe3d069be7cd207fee8fffa90.tar.gz
meson-57d3ece5fc4e883fe3d069be7cd207fee8fffa90.tar.bz2
Merge pull request #2217 from mesonbuild/gcc7
Use GCC 7 for cross compilation tests.
Diffstat (limited to 'cross')
-rw-r--r--cross/ubuntu-armhf.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
index d0fce20..367eba3 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-6'
-cpp = '/usr/bin/arm-linux-gnueabihf-g++-6'
+c = '/usr/bin/arm-linux-gnueabihf-gcc-7'
+cpp = '/usr/bin/arm-linux-gnueabihf-g++-7'
ar = '/usr/arm-linux-gnueabihf/bin/ar'
strip = '/usr/arm-linux-gnueabihf/bin/strip'
pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'