From 5f3558817e3f9efaa27d636afc542d846da9ab9f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 12 May 2023 11:07:10 +0200 Subject: [PATCH] Workaround for rust-embedded/cross issue 598 is no longer required --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3489db4..f7c9023 100644 --- a/Makefile +++ b/Makefile @@ -66,15 +66,14 @@ armv7-binary-release: armv7-binary-debug: cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl -# Hack to workaround https://github.com/rust-embedded/cross/issues/598 -HACK_WORKAROUND_ISSUE_598=CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C link-arg=/usr/local/aarch64-linux-musl/lib/libc.a" +# As of 2023-05-12 (and probably earlier!) this is no longer required with current Rust nightlies +# # Hack to workaround https://github.com/rust-embedded/cross/issues/598 +# HACK_WORKAROUND_ISSUE_598=CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C link-arg=/usr/local/aarch64-linux-musl/lib/libc.a" aarch64-binary: aarch64-binary-release aarch64-binary-release: - $(HACK_WORKAROUND_ISSUE_598) \ - cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl + cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl aarch64-binary-debug: - $(HACK_WORKAROUND_ISSUE_598) \ - cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl + cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl