about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2022-07-27 11:52:57 +0900
committerGitHub <noreply@github.com>2022-07-27 11:52:57 +0900
commita76f2fe66e584af3c63bcd48905f5fd4c8566c23 (patch)
treeed3d37d245247eba04c0999dfdc22a77c31d0af1
parent7f608e99dcc0704769c6e4e523da16591848b2fe (diff)
parent05c1a4ab4dde6a43a327a25c7b27eb2437378ef1 (diff)
downloadrust-a76f2fe66e584af3c63bcd48905f5fd4c8566c23.tar.gz
rust-a76f2fe66e584af3c63bcd48905f5fd4c8566c23.zip
Rollup merge of #99765 - nicholasbishop:bishop-disable-uefi-std-build, r=jyn514
Don't build std for *-uefi targets

https://github.com/rust-lang/rust/issues/97322
-rw-r--r--src/bootstrap/config.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index ea0f78e2a6b..c7212ad2c21 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -411,7 +411,11 @@ pub struct Target {
 impl Target {
     pub fn from_triple(triple: &str) -> Self {
         let mut target: Self = Default::default();
-        if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
+        if triple.contains("-none")
+            || triple.contains("nvptx")
+            || triple.contains("switch")
+            || triple.contains("-uefi")
+        {
             target.no_std = true;
         }
         target