about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-09-20 07:22:54 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2022-09-21 15:35:53 +0000
commit7e23244ef1ace2bef8b260b68316fbce9873f1b6 (patch)
treeb41e00bcc2a3db95b98e24c3931ee80d8eb3a270
parent6cfa7ef2ba1a4781605697c78901c9c10353c58f (diff)
downloadrust-7e23244ef1ace2bef8b260b68316fbce9873f1b6.tar.gz
rust-7e23244ef1ace2bef8b260b68316fbce9873f1b6.zip
HACK: Treat miri as if it were a submodule
-rw-r--r--src/bootstrap/check.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 9937b08561c..229851238f1 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -456,7 +456,9 @@ tool_check_step!(Rustdoc, "src/tools/rustdoc", "src/librustdoc", SourceType::InT
 // behavior, treat it as in-tree so that any new warnings in clippy will be
 // rejected.
 tool_check_step!(Clippy, "src/tools/clippy", SourceType::InTree);
-tool_check_step!(Miri, "src/tools/miri", SourceType::InTree);
+// Miri on the other hand is treated as out of tree, since InTree also causes it to
+// be run as part of `check`, which can fail on platforms which libffi-sys has no support for.
+tool_check_step!(Miri, "src/tools/miri", SourceType::Submodule);
 tool_check_step!(Rls, "src/tools/rls", SourceType::InTree);
 tool_check_step!(Rustfmt, "src/tools/rustfmt", SourceType::InTree);