build: arm targets use armv7-linux-androideabi and armv7-unknown-linu…

…x-gnueabihf
mesalock-linux · Nov 24, 2018 · 95b66d4 · 95b66d4
1 parent f551819
commit 95b66d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,9 @@ rust:
 - nightly
 env:
 - ARCH=x86_64_linux
-- ARCH=arm_linux TARGET=arm-linux-gnueabi RUST_TARGET=arm-unknown-linux-gnueabi
+- ARCH=arm_linux TARGET=arm-linux-gnueabihf RUST_TARGET=armv7-unknown-linux-gnueabihf
 - ARCH=aarch64_linux TARGET=aarch64-linux-gnu RUST_TARGET=aarch64-unknown-linux-gnu
-- ARCH=arm_android TARGET=arm-linux-androideabi RUST_TARGET=arm-linux-androideabi
+- ARCH=arm_android TARGET=arm-linux-androideabi RUST_TARGET=armv7-linux-androideabi
   NDK_API=19 NDK_ARCH=arm
 - ARCH=aarch64_android TARGET=aarch64-linux-android RUST_TARGET=aarch64-linux-android
   NDK_API=21 NDK_ARCH=arm64

diff --git a/ci-scripts/install.sh b/ci-scripts/install.sh
@@ -4,7 +4,7 @@ set -xev
 
 if [[ "$TARGET" == "arm-linux-gnueabi" ]]
 then
-    sudo apt-get install -qq gcc-arm-linux-gnueabi libc6-armel-cross libc6-dev-armel-cross
+    sudo apt-get install -qq gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf libc6-armel-cross libc6-dev-armel-cross
 elif [[ "$TARGET" == "aarch64-linux-gnu" ]]
 then
     sudo apt-get install -qq gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross