]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #99765 - nicholasbishop:bishop-disable-uefi-std-build, r=jyn514
authorYuki Okushi <jtitor@2k36.org>
Wed, 27 Jul 2022 02:52:57 +0000 (11:52 +0900)
committerGitHub <noreply@github.com>
Wed, 27 Jul 2022 02:52:57 +0000 (11:52 +0900)
Don't build std for *-uefi targets

https://github.com/rust-lang/rust/issues/97322

src/bootstrap/config.rs

index ea0f78e2a6be9da2c9461497e2bafb53ca18b6ec..c7212ad2c21665160df2edf44b1aa5509b110d5a 100644 (file)
@@ -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