From 66d5bc11d80c3c448c655c6857a1bd570236e1b6 Mon Sep 17 00:00:00 2001 From: finn Date: Tue, 20 Dec 2022 02:12:11 -0800 Subject: [PATCH] copy aarch64 config to other arms --- .cargo/config | 6 +++--- prepare-env.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cargo/config b/.cargo/config index df40aa0..a055969 100644 --- a/.cargo/config +++ b/.cargo/config @@ -4,10 +4,10 @@ linker = "aarch64-linux-gnu-gcc" [target.arm-unknown-linux-gnueabi] -linker = "lld-13" +linker = "arm-linux-gnueabi-gcc" [target.arm-unknown-linux-gnueabihf] -linker = "lld-13" +linker = "arm-linux-gnueabihf-gcc" [target.armv7-unknown-linux-gnueabihf] -linker = "lld-13" +linker = "arm-linux-gnueabihf-gcc" \ No newline at end of file diff --git a/prepare-env.sh b/prepare-env.sh index aa2eaf7..f626b1c 100755 --- a/prepare-env.sh +++ b/prepare-env.sh @@ -6,16 +6,16 @@ apt-get update PACKAGES=("git" "clang-13" "libclang-dev" "cmake" "make") # "gcc-multilib" "g++-multilib") case "${TARGET}" in aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl) - apt-get install -yqq "${PACKAGES[@]}" gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu + apt-get install -yqq "${PACKAGES[@]}" {binutils,g++,gcc}-aarch64-linux-gnu ;; arm-unknown-linux-gnueabi|arm-unknown-linux-musleabi) - apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross + apt-get install -yqq "${PACKAGES[@]}" {binutils,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross ;; arm-unknown-linux-gnueabihf|arm-unknown-linux-musleabihf) - apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armhf-cross + apt-get install -yqq "${PACKAGES[@]}" {binutils,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armhf-cross ;; armv7-unknown-linux-gnueabihf|armv7-unknown-linux-musleabihf) - apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armel-cross + apt-get install -yqq "${PACKAGES[@]}" {binutils,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armel-cross ;; x86_64-unknown-linux-musl) apt-get install -yqq "${PACKAGES[@]}" musl-tools