aboutsummaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-19 13:48:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-20 20:33:59 +0200
commit2b650834631e09eee8dffa68a2058769a651d6f7 (patch)
tree8dde784ee275d306864baf0a8299ccbde5c24ded /cross
parent4317edca25a29a191c51c520e2861f6d45f7b6b1 (diff)
downloadmeson-2b650834631e09eee8dffa68a2058769a651d6f7.zip
meson-2b650834631e09eee8dffa68a2058769a651d6f7.tar.gz
meson-2b650834631e09eee8dffa68a2058769a651d6f7.tar.bz2
Fix cross test and run them if a cross compiler is available.
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 09cbced..4aa52fa 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'
-cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+c = '/usr/bin/arm-linux-gnueabihf-gcc-6'
+cpp = '/usr/bin/arm-linux-gnueabihf-g++-6'
ar = '/usr/arm-linux-gnueabihf/bin/ar'
strip = '/usr/arm-linux-gnueabihf/bin/strip'
pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'