Skip to content

Commit b8cee0e

Browse files
committed
Auto merge of rust-lang#82594 - nagisa:nagisa/remove-rumprun, r=petrochenkov
Remove the x86_64-rumprun-netbsd target Herein we remove the target from the compiler and the code from libstd intended to support the now-defunct rumprun project. Closes rust-lang#81514
2 parents ea82d42 + f538207 commit b8cee0e

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

std/src/sys/unix/stack_overflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl Drop for Handler {
3434
target_os = "freebsd",
3535
target_os = "solaris",
3636
target_os = "illumos",
37-
all(target_os = "netbsd", not(target_vendor = "rumprun")),
37+
target_os = "netbsd",
3838
target_os = "openbsd"
3939
))]
4040
mod imp {
@@ -218,7 +218,7 @@ mod imp {
218218
target_os = "freebsd",
219219
target_os = "solaris",
220220
target_os = "illumos",
221-
all(target_os = "netbsd", not(target_vendor = "rumprun")),
221+
target_os = "netbsd",
222222
target_os = "openbsd",
223223
)))]
224224
mod imp {

std/src/sys/unix/thread.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ impl Drop for Thread {
202202
not(target_os = "linux"),
203203
not(target_os = "freebsd"),
204204
not(target_os = "macos"),
205-
not(all(target_os = "netbsd", not(target_vendor = "rumprun"))),
205+
not(target_os = "netbsd"),
206206
not(target_os = "openbsd"),
207207
not(target_os = "solaris")
208208
))]
@@ -222,7 +222,7 @@ pub mod guard {
222222
target_os = "linux",
223223
target_os = "freebsd",
224224
target_os = "macos",
225-
all(target_os = "netbsd", not(target_vendor = "rumprun")),
225+
target_os = "netbsd",
226226
target_os = "openbsd",
227227
target_os = "solaris"
228228
))]

unwind/build.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ fn main() {
2222
}
2323
} else if target.contains("freebsd") {
2424
println!("cargo:rustc-link-lib=gcc_s");
25-
} else if target.contains("rumprun") {
26-
println!("cargo:rustc-link-lib=unwind");
2725
} else if target.contains("netbsd") {
2826
println!("cargo:rustc-link-lib=gcc_s");
2927
} else if target.contains("openbsd") {

0 commit comments

Comments
 (0)