Skip to content

Commit 9e9693e

Browse files
committed
rust: Switch to RUSTC_BOOTSTRAP=1 backdoor instead of nightly
Nightly is messing around with alloc_error_handler and they can't seem to make up their mind about it, breaking our CI. Just switch to stable rust with the usual backdoor to enable unstable features (same as the kernel does). Signed-off-by: Hector Martin <[email protected]>
1 parent 1933e59 commit 9e9693e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: Install nightly rust
3131
run: |
32-
export RUSTUP_TOOLCHAIN=nightly
32+
export RUSTUP_TOOLCHAIN=stable
3333
rustup target install aarch64-unknown-none-softfloat
3434
3535
- name: Build

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CFG += RELEASE
4949
endif
5050

5151
# Required for no_std + alloc for now
52-
export RUSTUP_TOOLCHAIN=nightly
52+
export RUSTC_BOOTSTRAP=1
5353
RUST_LIB := librust.a
5454
RUST_LIBS :=
5555
ifeq ($(CHAINLOADING),1)

0 commit comments

Comments
 (0)