Skip to content

Commit a8a788d

Browse files
committed
Upgrade toolchain channel to nightly-2021-10-20
CI: Explicitly set build-std without std Else, cargo unifies with rusty-hermit's outer .cargo/config.toml and tries to build std for the kernel, which fails with: error[E0432]: unresolved import `crate::sys::hermit::thread_local_dtor` --> /home/mkroening/.rustup/toolchains/nightly-2021-10-20-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/hermit/thread.rs:9:25 | 9 | use crate::sys::hermit::thread_local_dtor::run_dtors; | ^^^^^^^^^^^^^^^^^ could not find `thread_local_dtor` in `hermit` error[E0432]: unresolved import `crate::sys::hermit::thread_local_dtor` --> /home/mkroening/.rustup/toolchains/nightly-2021-10-20-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/hermit/mod.rs:122:29 | 122 | use crate::sys::hermit::thread_local_dtor::run_dtors; | ^^^^^^^^^^^^^^^^^ could not find `thread_local_dtor` in `hermit`
1 parent 73994fd commit a8a788d

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[unstable]
2+
# Keep in sync with CI!
23
build-std = ["core", "alloc"]
34
build-std-features = ["compiler-builtins-mem"]
45

.github/workflows/x86.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: rustup show
4040
- name: Build minimal kernel
4141
working-directory: libhermit-rs
42-
run: cargo build --no-default-features
42+
run: cargo build --no-default-features -Z build-std=core,alloc
4343
- name: Build dev profile
4444
run: cargo build
4545
- name: Unittests on host (ubuntu)

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2021-09-29"
2+
channel = "nightly-2021-10-20"
33
components = [
44
"rust-src",
55
"llvm-tools-preview",

0 commit comments

Comments
 (0)