From 0a1b0be7f3a3d0d6e29ef16a1c587888f1f75084 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 19 Jul 2021 15:05:41 +0000 Subject: [PATCH] dev-lang/rust: don't enable aarch64 cross target when host is aarch64 This does not work because the host and cross rust targets share the same name. This needs to be reworked to (potentially) enable x86 cross targets for aarch64 targets. Signed-off-by: Jeremi Piotrowski --- .../coreos-overlay/dev-lang/rust/rust-1.53.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.53.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.53.0.ebuild index d190cf2fe3..9e83df13a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.53.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.53.0.ebuild @@ -190,7 +190,7 @@ src_configure() { fi fi # Auto-enable cross-building only if the cross-compiler is available - if [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then + if [ "${CBUILD}" != "aarch64-unknown-linux-gnu" ] && [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then rust_targets="${rust_targets},\"aarch64-unknown-linux-gnu\"" fi rust_targets="${rust_targets#,}" @@ -300,7 +300,7 @@ src_configure() { fi done # Could soon be replaced by the "experimental cross support" below - if [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then + if [ "${CBUILD}" != "aarch64-unknown-linux-gnu" ] && [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then cat <<- 'EOF' > "${S}/cc.sh" #!/bin/bash args=("$@")