Skip to content

Commit 598b187

Browse files
committed
bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds
The custom LLVM version suffix was introduced to avoid unintentional library names conflicts. By default it included the LLVM submodule commit hash. Changing the version suffix requires the complete LLVM rebuild, and since then every change to the submodules required it as well. Remove the commit hash from version suffix to avoid complete rebuilds, while leaving the `rust` string, the release number and release channel to disambiguate the library name.
1 parent 9c230f3 commit 598b187

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/bootstrap/native.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,8 @@ impl Step for Llvm {
241241
cfg.define("LLVM_VERSION_SUFFIX", suffix);
242242
}
243243
} else {
244-
let mut default_suffix =
245-
format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel,);
246-
if let Some(sha) = llvm_info.sha_short() {
247-
default_suffix.push_str("-");
248-
default_suffix.push_str(sha);
249-
}
244+
let default_suffix =
245+
format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel);
250246
cfg.define("LLVM_VERSION_SUFFIX", default_suffix);
251247
}
252248

0 commit comments

Comments
 (0)