lang/rust now supports a single target on riscv64, drop patch

ok ajacoutot@ (maintainer)
This commit is contained in:
jca 2023-01-04 12:05:19 +00:00
parent e51779eea6
commit b2893d205d
2 changed files with 1 additions and 18 deletions

View File

@ -1,17 +0,0 @@
Index: build/moz.configure/rust.configure
--- build/moz.configure/rust.configure.orig
+++ build/moz.configure/rust.configure
@@ -394,6 +394,13 @@ def detect_rustc_target(
if len(narrowed) == 1:
return narrowed[0].rust_target
+ # Temporary workaround for riscv64: the official rust target name is
+ # riscv64gc-unknown-openbsd but our port also supports
+ # riscv64-unknown-openbsd as an alias, so the narrowed list on riscv64
+ # contains two entries. Just pick the first one.
+ if len(narrowed) >= 1:
+ return narrowed[0].rust_target
+
return None
rustc_target = find_candidate(candidates)

View File

@ -1,4 +1,4 @@
Support riscv64-unknown-openbsd
Support riscv64gc-unknown-openbsd
Index: third_party/rust/cc/src/lib.rs
--- third_party/rust/cc/src/lib.rs.orig