Skip to content

Commit 6aaa463

Browse files
committed
no-mistakes(review): Add darwin-x64 target to pin and drop stable bootstrap
1 parent b2abc14 commit 6aaa463

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

‎rust-toolchain.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
channel = "1.94.1"
77
components = ["rustfmt", "clippy"]
88
profile = "minimal"
9+
# darwin-x64 is cross-built on the arm64 Mac.
10+
targets = ["x86_64-apple-darwin"]

‎scripts/build-linux-arm64.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ apt_install gcc-11 g++-11 clang libclang-dev cmake pkg-config libssl-dev make bi
139139
140140
if ! command -v cargo >/dev/null 2>&1; then
141141
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
142-
| sh -s -- -y --default-toolchain stable --profile minimal >/dev/null || exit 1
142+
| sh -s -- -y --default-toolchain none --profile minimal >/dev/null || exit 1
143143
fi
144144
. "$HOME/.cargo/env"
145145
@@ -162,6 +162,7 @@ restore_ownership() {
162162
trap restore_ownership EXIT
163163
164164
cd /src
165+
rustc --version || { echo "RUST TOOLCHAIN INSTALL FAILED"; exit 1; }
165166
export CARGO_TARGET_DIR=/target
166167
export CC=gcc-11 CXX=g++-11
167168
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=gcc-11

0 commit comments

Comments
 (0)