Skip to content

Commit

Permalink
Upgrade toolchain channel to nightly-2021-10-20
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
mkroening committed Dec 1, 2021
1 parent 12710fc commit 323d1e0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[unstable]
# Keep in sync with CI!
build-std = ["core", "alloc"]
build-std-features = ["compiler-builtins-mem"]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: rustup show
- name: Build minimal kernel
working-directory: libhermit-rs
run: cargo build --no-default-features
run: cargo build --no-default-features -Z build-std=core,alloc
- name: Build dev profile
run: cargo build
- name: Unittests on host (ubuntu)
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2021-10-19"
channel = "nightly-2021-10-20"
components = [
"rust-src",
"llvm-tools-preview",
Expand Down

0 comments on commit 323d1e0

Please sign in to comment.