Skip to content

Commit f76ab64

Browse files
committed
Add more descriptions to why submodules are required.
1 parent 5ebb821 commit f76ab64

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Diff for: src/bootstrap/src/core/build_steps/compile.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ impl Step for Std {
188188
if builder.config.profiler {
189189
builder.require_and_update_submodule(
190190
"src/llvm-project",
191-
Some("The `build.profiler` config option requires compiler-rt sources."),
191+
Some(
192+
"The `build.profiler` config option requires `compiler-rt` sources from LLVM.",
193+
),
192194
);
193195
}
194196

@@ -462,8 +464,8 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
462464
builder.require_and_update_submodule(
463465
"src/llvm-project",
464466
Some(
465-
"need LLVM sources available to build `compiler-rt`, but they weren't present; \
466-
consider disabling `optimized-compiler-builtins`",
467+
"The `build.optimized-compiler-builtins` config option \
468+
requires `compiler-rt` sources from LLVM.",
467469
),
468470
);
469471
let compiler_builtins_root = builder.src.join("src/llvm-project/compiler-rt");

Diff for: src/bootstrap/src/core/build_steps/llvm.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,10 @@ impl Step for CrtBeginEnd {
11971197

11981198
/// Build crtbegin.o/crtend.o for musl target.
11991199
fn run(self, builder: &Builder<'_>) -> Self::Output {
1200-
builder.require_and_update_submodule("src/llvm-project", None);
1200+
builder.require_and_update_submodule(
1201+
"src/llvm-project",
1202+
Some("The LLVM sources are required for the CRT from `compiler-rt`."),
1203+
);
12011204

12021205
let out_dir = builder.native_dir(self.target).join("crt");
12031206

@@ -1270,7 +1273,10 @@ impl Step for Libunwind {
12701273

12711274
/// Build libunwind.a
12721275
fn run(self, builder: &Builder<'_>) -> Self::Output {
1273-
builder.require_and_update_submodule("src/llvm-project", None);
1276+
builder.require_and_update_submodule(
1277+
"src/llvm-project",
1278+
Some("The LLVM sources are required for libunwind."),
1279+
);
12741280

12751281
if builder.config.dry_run() {
12761282
return PathBuf::new();

0 commit comments

Comments
 (0)