From de29baee77c5dd28b20bacf9407ceabd88bfb55f Mon Sep 17 00:00:00 2001 From: Kai Kriegel Date: Mon, 14 Feb 2022 23:34:30 +0000 Subject: [PATCH] lets try armv6 again --- .gitlab-ci.yml | 10 ++++++++++ cargo-cross-config | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a03deb8..1761c61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,17 +113,22 @@ build:nightly: before_script: - cp cargo-cross-config /usr/local/cargo/config - dpkg --add-architecture armhf + - dpkg --add-architecture armel - apt-get update -y - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf + - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libc6-armel-cross libc6-dev-armel-cross gcc-arm-linux-gnueabi g++-arm-linux-gnueabi - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y --no-install-recommends capnproto build-essential cmake clang libclang-dev libgsasl7-dev libgsasl7-dev:armhf libssl-dev:armhf - rustup target add armv7-unknown-linux-gnueabihf + - rustup target add arm-unknown-linux-gnueabihf script: - cargo update + - cargo build --release --target arm-unknown-linux-gnueabihf - cargo build --release --target armv7-unknown-linux-gnueabihf - cargo build --release --target x86_64-unknown-linux-gnu artifacts: paths: + - target/arm-unknown-linux-gnueabihf/release - target/armv7-unknown-linux-gnueabihf/release - target/x86_64-unknown-linux-gnu/release # only: @@ -140,17 +145,22 @@ build:release: before_script: - cp cargo-cross-config /usr/local/cargo/config - dpkg --add-architecture armhf + - dpkg --add-architecture armel - apt-get update -y - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libc6-armhf-cross libc6-dev-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf + - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y libc6-armel-cross libc6-dev-armel-cross gcc-arm-linux-gnueabi g++-arm-linux-gnueabi - apt-get install -o dir::cache::archives="$APT_CACHE_DIR" -y --no-install-recommends capnproto build-essential cmake clang libclang-dev libgsasl7-dev libgsasl7-dev:armhf libssl-dev:armhf - rustup target add armv7-unknown-linux-gnueabihf + - rustup target add arm-unknown-linux-gnueabihf script: - cargo update + - cargo build --release --target arm-unknown-linux-gnueabihf - cargo build --release --target armv7-unknown-linux-gnueabihf - cargo build --release --target x86_64-unknown-linux-gnu artifacts: paths: + - target/arm-unknown-linux-gnueabihf/release - target/armv7-unknown-linux-gnueabihf/release - target/x86_64-unknown-linux-gnu/release rules: diff --git a/cargo-cross-config b/cargo-cross-config index b0ce393..2400f10 100644 --- a/cargo-cross-config +++ b/cargo-cross-config @@ -1,3 +1,5 @@ [target.armv7-unknown-linux-gnueabihf] linker = "arm-linux-gnueabihf-gcc" +[target.arm-unknown-linux-gnueabihf] +linker = "arm-linux-gnueabi-gcc"