diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88dd38aaa..04eee4e05 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,7 +14,7 @@ jobs: vmImage: $(VM_IMAGE) variables: VM_IMAGE: ubuntu-latest - TOOLCHAIN: 1.42.0 + TOOLCHAIN: 1.47.0 CARGO_NET_RETRY: 3 CARGO_HTTP_CHECK_REVOKE: false strategy: diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl index 507de85d6..79b5b08cd 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-musl +++ b/docker/Dockerfile.aarch64-unknown-linux-musl @@ -21,9 +21,6 @@ RUN ln -sf \ /usr/local/aarch64-linux-musl/lib/ld-musl-aarch64.so.1 ENV QEMU_LD_PREFIX=/usr/local/aarch64-linux-musl -# Workaround for https://github.com/rust-lang/rust/issues/46651 -ENV RUSTFLAGS="-C link-arg=-lgcc" - ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc \ CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER=qemu-aarch64 \ CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \