user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more descriptions to why submodules are required.

Browse source
This commit is contained in:
Eric Huss 2024-07-27 07:59:37 -07:00
parent 5ebb821fa9
commit f76ab647d3
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/src/core/build_steps/compile.rs
View file

@ -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");

10
src/bootstrap/src/core/build_steps/llvm.rs
View file

@ -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();