bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #137340 - Kobzol:bootstrap-dir-check, r=onur-ozkan

Browse source 
Add a notice about missing GCC sources into source tarballs

I didn't use `.gitkeep`, because that would be a hidden file that might not be noticed, whereas we want to let people inspecting the archive know why the sources are missing.

Inspired by https://github.com/rust-lang/rust/issues/137332.

r? `@onur-ozkan`
This commit is contained in:
Jubilee 2025-02-20 14:58:22 -08:00 • committed by GitHub
commit 4d479f9c80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -1029,6 +1029,17 @@ impl Step for PlainSourceTarball {
],
plain_dst_src,
);
// We keep something in src/gcc because it is a registered submodule,
// and if it misses completely it can cause issues elsewhere
// (see https://github.com/rust-lang/rust/issues/137332).
// We can also let others know why is the source code missing.
if !builder.config.dry_run() {
builder.create_dir(&plain_dst_src.join("src/gcc"));
t!(std::fs::write(
plain_dst_src.join("src/gcc/notice.txt"),
"The GCC source code is not included due to unclear licensing implications\n"
));
}
// Copy the files normally
for item in &src_files {

2
src/bootstrap/src/lib.rs
View file

@ -492,7 +492,7 @@ impl Build {
}
self.config.update_submodule(submodule);
let absolute_path = self.config.src.join(submodule);
if dir_is_empty(&absolute_path) {
if !absolute_path.exists() || dir_is_empty(&absolute_path) {
let maybe_enable = if !self.config.submodules()
&& self.config.rust_info.is_managed_git_subrepository()
{