diff options
| author | bors <bors@rust-lang.org> | 2023-09-22 08:36:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-22 08:36:18 +0000 |
| commit | ce33ca0a1e5d10589fa6ea89ef64242b1b6552dc (patch) | |
| tree | 9155b7bc012f9b7342a94f59f74ae7145de9861a /src/bootstrap | |
| parent | aea1eff871cdb587e936613a9b3d160cd5d61049 (diff) | |
| parent | 896065f902602e99c6996cee9cee99ab7c00dcaa (diff) | |
| download | rust-ce33ca0a1e5d10589fa6ea89ef64242b1b6552dc.tar.gz rust-ce33ca0a1e5d10589fa6ea89ef64242b1b6552dc.zip | |
Auto merge of #3074 - rust-lang:rustup-2023-09-22, r=RalfJung
Automatic sync from rustc
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 4 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index a9aa7524e8b..d58f0d54d3a 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -265,7 +265,8 @@ def default_build_triple(verbose): 'FreeBSD': 'unknown-freebsd', 'Haiku': 'unknown-haiku', 'NetBSD': 'unknown-netbsd', - 'OpenBSD': 'unknown-openbsd' + 'OpenBSD': 'unknown-openbsd', + 'GNU': 'unknown-hurd', } # Consider the direct transformation first and then the special cases @@ -336,6 +337,7 @@ def default_build_triple(verbose): 'i386': 'i686', 'i486': 'i686', 'i686': 'i686', + 'i686-AT386': 'i686', 'i786': 'i686', 'loongarch64': 'loongarch64', 'm68k': 'm68k', diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 1e001fae8ab..8b8d4b23795 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -133,7 +133,9 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &str, Option<&[&'static str]>)] = &[ // #[cfg(bootstrap)] (Some(Mode::Std), "target_vendor", Some(&["unikraft"])), (Some(Mode::Std), "target_env", Some(&["libnx"])), - (Some(Mode::Std), "target_os", Some(&["teeos"])), + // #[cfg(bootstrap)] hurd + (Some(Mode::Std), "target_os", Some(&["teeos", "hurd"])), + (Some(Mode::Rustc), "target_os", Some(&["hurd"])), // #[cfg(bootstrap)] mips32r6, mips64r6 ( Some(Mode::Std), |