Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ cd vscode && npm install && npm run esbuild # VS Code extension
npx @vscode/vsce package # VSIX
```

Requires Rust stable, Node.js 18+, VS Code 1.90+.
Requires rustup (it installs the Rust version pinned in `rust-toolchain.toml`), Node.js 18+, VS Code 1.90+.

---

Expand Down
10 changes: 10 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# One compiler for every release build. Each platform's engine is built on a
# different host (and linux-arm64 in a container that installs Rust itself);
# without a pin they drifted onto three different rustc versions, so one release
# shipped binaries the same source compiled differently.
[toolchain]
channel = "1.94.1"
components = ["rustfmt", "clippy"]
profile = "minimal"
# darwin-x64 is cross-built on the arm64 Mac.
targets = ["x86_64-apple-darwin"]
3 changes: 2 additions & 1 deletion scripts/build-linux-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ apt_install gcc-11 g++-11 clang libclang-dev cmake pkg-config libssl-dev make bi

if ! command -v cargo >/dev/null 2>&1; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --default-toolchain stable --profile minimal >/dev/null || exit 1
| sh -s -- -y --default-toolchain none --profile minimal >/dev/null || exit 1
fi
. "$HOME/.cargo/env"

Expand All @@ -162,6 +162,7 @@ restore_ownership() {
trap restore_ownership EXIT

cd /src
rustc --version || { echo "RUST TOOLCHAIN INSTALL FAILED"; exit 1; }
export CARGO_TARGET_DIR=/target
export CC=gcc-11 CXX=g++-11
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=gcc-11
Expand Down
2 changes: 1 addition & 1 deletion vscode/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ cd vscode && npm install && npm run esbuild # VS Code extension
npx @vscode/vsce package # VSIX
```

Requires Rust stable, Node.js 18+, VS Code 1.90+.
Requires rustup (it installs the Rust version pinned in `rust-toolchain.toml`), Node.js 18+, VS Code 1.90+.

---

Expand Down
Loading