Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-21 21:23:08 -05:00
Code Issues Activity

fix issue #1665 - use correct rust target

Browse source
This commit is contained in:
Bert van der Weerd 2023-11-21 16:25:34 +01:00
parent 0604931bc5
commit 0868bc1e64
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
patches/rust-gentoo-musl.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 7a2fd1ae70..7abdcaa2c1 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -404,11 +404,21 @@ def detect_rustc_target(
if len(narrowed) == 1:
return narrowed[0].rust_target
- # Finally, see if the vendor can be used to disambiguate.
+ # See if the vendor can be used to disambiguate.
narrowed = [c for c in candidates if c.target.vendor == host_or_target.vendor]
if len(narrowed) == 1:
return narrowed[0].rust_target
+ # Finally, check for vendor gentoo in the target triple.
+ vendor_aliases = {"unknown": ("gentoo")}
+ narrowed = [
+ c
+ for c in candidates
+ if host_or_target.vendor in vendor_aliases.get(c.target.vendor, ())
+ ]
+ if len(narrowed) == 1:
+ return narrowed[0].rust_target
+
return None
rustc_target = find_candidate(candidates)