Skip to content

Commit ce0901d

Browse files
committed
Add description message
Add more descriotion message and optimize code
1 parent 8e731ad commit ce0901d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/bootstrap/src/core/build_steps/dist.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2222,6 +2222,8 @@ impl Step for RustDev {
22222222
// If updating this, you likely want to change
22232223
// src/bootstrap/download-ci-llvm-stamp as well, otherwise local users
22242224
// will not pick up the extra file until LLVM gets bumped.
2225+
// We should include all the build artifacts that get from a source build,
2226+
// so that you can use the downloadable LLVM as if you’ve just run a full source build.
22252227
if src_bindir.exists() {
22262228
for entry in walkdir::WalkDir::new(&src_bindir) {
22272229
let entry = t!(entry);

src/bootstrap/src/core/config/config.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -2108,16 +2108,16 @@ impl Config {
21082108
llvm::is_ci_llvm_available(&self, asserts)
21092109
}
21102110
Some(StringOrBool::String(s)) if s == "if-unchanged" => {
2111-
if !self.rust_info.is_from_tarball() {
2112-
if self
2111+
// Git is needed to track modifications here, but tarball source is not available.
2112+
// If not modified here or built through tarball source, we maintain consistency
2113+
// with '"if available"'.
2114+
if !self.rust_info.is_from_tarball()
2115+
&& self
21132116
.last_modified_commit(&["src/llvm-project"], "download-ci-llvm", true)
21142117
.is_none()
2115-
{
2116-
// there are some untracked changes in the the given paths.
2117-
false
2118-
} else {
2119-
llvm::is_ci_llvm_available(&self, asserts)
2120-
}
2118+
{
2119+
// there are some untracked changes in the the given paths.
2120+
false
21212121
} else {
21222122
llvm::is_ci_llvm_available(&self, asserts)
21232123
}

0 commit comments

Comments
 (0)