File tree 2 files changed +10
-8
lines changed
2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -2222,6 +2222,8 @@ impl Step for RustDev {
2222
2222
// If updating this, you likely want to change
2223
2223
// src/bootstrap/download-ci-llvm-stamp as well, otherwise local users
2224
2224
// 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.
2225
2227
if src_bindir. exists ( ) {
2226
2228
for entry in walkdir:: WalkDir :: new ( & src_bindir) {
2227
2229
let entry = t ! ( entry) ;
Original file line number Diff line number Diff line change @@ -2108,16 +2108,16 @@ impl Config {
2108
2108
llvm:: is_ci_llvm_available ( & self , asserts)
2109
2109
}
2110
2110
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
2113
2116
. last_modified_commit ( & [ "src/llvm-project" ] , "download-ci-llvm" , true )
2114
2117
. 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
2121
2121
} else {
2122
2122
llvm:: is_ci_llvm_available ( & self , asserts)
2123
2123
}
You can’t perform that action at this time.
0 commit comments