Skip to content

Commit

Permalink
Rollup merge of rust-lang#90404 - mkroening:hermit-kernel-no-os, r=jo…
Browse files Browse the repository at this point in the history
…shtriplett

hermitkernel-target: Set OS to "none"

For our kernel targets, we should not set OS, as the kernel runs bare
metal without a circular dependency on std.

This also prepares us for unifying with
rust-lang#89062. This patch requires
libhermit-rs to change a `cfg`s from `target_os = "hermit"` to `target_os
= "none"`.

I tested this patch locally.

CC: `@stlankes`
  • Loading branch information
matthiaskrgr authored Oct 30, 2021
2 parents 0da75bc + 311a249 commit ce48803
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion compiler/rustc_target/src/spec/hermit_kernel_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pub fn opts() -> TargetOptions {
);

TargetOptions {
os: "hermit".to_string(),
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
disable_redzone: true,
linker: Some("rust-lld".to_owned()),
Expand Down

0 comments on commit ce48803

Please sign in to comment.