From 801ce2f5bc065cdbe4f771299ebf35ec62b1e783 Mon Sep 17 00:00:00 2001 From: james58899 Date: Thu, 22 Feb 2024 16:18:38 +0000 Subject: [PATCH] Fix docker build --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae7a6d4..9d3bebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VERSI wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && apt-get update && \ apt-get install -y eatmydata && eatmydata apt-get install -y crossbuild-essential-arm64 clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clangd-$LLVM_VERSION && \ rm -rf /var/lib/apt/lists/* -RUN rustup toolchain install nightly && rustup target add --toolchain nightly aarch64-unknown-linux-gnu +RUN rustup update && rustup toolchain install nightly && rustup target add --toolchain nightly aarch64-unknown-linux-gnu RUN --mount=type=bind,target=. --mount=type=cache,target=/root/.cargo cargo fetch ARG TARGETARCH RUN --mount=type=bind,rw,target=. --mount=type=cache,target=/root/.cargo --mount=type=cache,target=target,id=target-$TARGETARCH \ @@ -18,7 +18,7 @@ RUN --mount=type=bind,rw,target=. --mount=type=cache,target=/root/.cargo --mount CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang-${LLVM_VERSION} -Clink-arg=-fuse-ld=lld-${LLVM_VERSION} -Clink-arg=--target=aarch64-unknown-linux-gnu" \ cargo +nightly -Ztarget-applies-to-host -Zhost-config install --target=aarch64-unknown-linux-gnu --path . ; \ else \ - RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang-${LLVM_VERSION} -Clink-arg=-fuse-ld=lld-${LLVM_VERSION}" cargo install --path . ; \ + RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang-${LLVM_VERSION} -Clink-arg=-fuse-ld=lld-${LLVM_VERSION}" cargo +nightly install --path . ; \ fi FROM debian:bookworm-slim