diff options
| author | bors <bors@rust-lang.org> | 2021-10-30 22:39:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-30 22:39:24 +0000 |
| commit | 46ce6a77c2335279e4da149efc6433468a2edd23 (patch) | |
| tree | 8cae34e1ec9a0128b07d92294048396bfe98898e /compiler | |
| parent | e249ce6b2345587d6e11052779c86adbad626dff (diff) | |
| parent | ce48803bfe4743e22ec680a08418b3080b2823ad (diff) | |
| download | rust-46ce6a77c2335279e4da149efc6433468a2edd23.tar.gz rust-46ce6a77c2335279e4da149efc6433468a2edd23.zip | |
Auto merge of #90424 - matthiaskrgr:rollup-jezzu4f, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #89789 (Add #[must_use] to thread::Builder) - #89899 (Add #[must_use] to remaining alloc functions) - #90401 (hermit: Implement Condvar::wait_timeout) - #90404 (hermitkernel-target: Set OS to "none") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_target/src/spec/hermit_kernel_base.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_target/src/spec/hermit_kernel_base.rs b/compiler/rustc_target/src/spec/hermit_kernel_base.rs index 414b0f7ff23..ce3dad26458 100644 --- a/compiler/rustc_target/src/spec/hermit_kernel_base.rs +++ b/compiler/rustc_target/src/spec/hermit_kernel_base.rs @@ -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()), |