diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs index 1efa3c8ada3a..6bea163cdfe2 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs @@ -188,7 +188,9 @@ impl Step for Std { if builder.config.profiler { builder.require_and_update_submodule( "src/llvm-project", - Some("The `build.profiler` config option requires compiler-rt sources."), + Some( + "The `build.profiler` config option requires `compiler-rt` sources from LLVM.", + ), ); } @@ -462,8 +464,8 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car builder.require_and_update_submodule( "src/llvm-project", Some( - "need LLVM sources available to build `compiler-rt`, but they weren't present; \ - consider disabling `optimized-compiler-builtins`", + "The `build.optimized-compiler-builtins` config option \ + requires `compiler-rt` sources from LLVM.", ), ); let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt"); diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs index 5d892275ad36..f8a22b974885 100644 --- a/src/bootstrap/src/core/build_steps/llvm.rs +++ b/src/bootstrap/src/core/build_steps/llvm.rs @@ -1197,7 +1197,10 @@ impl Step for CrtBeginEnd { /// Build crtbegin.o/crtend.o for musl target. fn run(self, builder: &Builder<'_>) -> Self::Output { - builder.require_and_update_submodule("src/llvm-project", None); + builder.require_and_update_submodule( + "src/llvm-project", + Some("The LLVM sources are required for the CRT from `compiler-rt`."), + ); let out_dir = builder.native_dir(self.target).join("crt"); @@ -1270,7 +1273,10 @@ impl Step for Libunwind { /// Build libunwind.a fn run(self, builder: &Builder<'_>) -> Self::Output { - builder.require_and_update_submodule("src/llvm-project", None); + builder.require_and_update_submodule( + "src/llvm-project", + Some("The LLVM sources are required for libunwind."), + ); if builder.config.dry_run() { return PathBuf::new();