mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

write git-commit-{sha,info} for Cargo in source tarballs

Browse Source 
This will allow Cargo's build script to pick it up, and populate the
correct git information in its version output.
This commit is contained in:
Pietro Albini 2024-04-30 11:17:25 +02:00
parent f973a15a10
commit 7a5038fb49
No known key found for this signature in database
GPG Key ID: CD76B35F7734769E
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bootstrap/src/core/build_steps/dist.rs
View File

@ -25,7 +25,7 @@ use crate::core::build_steps::llvm;
use crate::core::build_steps::tool::{self, Tool}; use crate::core::build_steps::tool::{self, Tool};
use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step}; use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
use crate::core::config::TargetSelection; use crate::core::config::TargetSelection;
use crate::utils::channel; use crate::utils::channel::{self, Info};
use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit}; use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball}; use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS}; use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
@ -991,10 +991,17 @@ impl Step for PlainSourceTarball {
// Create the version file // Create the version file
builder.create(&plain_dst_src.join("version"), &builder.rust_version()); builder.create(&plain_dst_src.join("version"), &builder.rust_version());
if let Some(info) = builder.rust_info().info() {
channel::write_commit_hash_file(plain_dst_src, &info.sha); // Create the files containing git info, to ensure --version outputs the same.
channel::write_commit_info_file(plain_dst_src, info); let write_git_info = |info: Option<&Info>, path: &Path| {
} if let Some(info) = info {
t!(std::fs::create_dir_all(path));
channel::write_commit_hash_file(path, &info.sha);
channel::write_commit_info_file(path, info);
}
};
write_git_info(builder.rust_info().info(), plain_dst_src);
write_git_info(builder.cargo_info.info(), &plain_dst_src.join("./src/tools/cargo"));
// If we're building from git or tarball sources, we need to vendor // If we're building from git or tarball sources, we need to vendor
// a complete distribution. // a complete distribution.