itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-10-02 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #145794 - he32:bootstrap-netbsd-fix, r=Kobzol

Browse Source 
bootstrap.py: Improve CPU detection on NetBSD

...and add some adaptation of detection for some arm variants.
This commit is contained in:
Stuart Cook 2025-08-25 19:52:21 +10:00 committed by GitHub
commit d89d8a7909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bootstrap/bootstrap.py
View File

@ -312,6 +312,12 @@ def default_build_triple(verbose):
kernel, cputype, processor = uname.decode(default_encoding).split(maxsplit=2)
# ON NetBSD, use `uname -p` to set the CPU type
if kernel == "NetBSD":
cputype = (
subprocess.check_output(["uname", "-p"]).strip().decode(default_encoding)
)
# The goal here is to come up with the same triple as LLVM would,
# at least for the subset of platforms we're willing to target.
kerneltype_mapper = {
@ -433,10 +439,16 @@ def default_build_triple(verbose):
kernel = "linux-androideabi"
else:
kernel += "eabihf"
elif cputype in {"armv7l", "armv8l"}:
elif cputype in {"armv6hf", "earmv6hf"}:
cputype = "armv6"
if kernel == "unknown-netbsd":
kernel += "-eabihf"
elif cputype in {"armv7l", "earmv7hf", "armv8l"}:
cputype = "armv7"
if kernel == "linux-android":
kernel = "linux-androideabi"
elif kernel == "unknown-netbsd":
kernel += "-eabihf"
else:
kernel += "eabihf"
elif cputype == "mips":