From 598b187e2738b5b551f84be30cc15503896fe4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Sun, 23 Feb 2020 00:00:00 +0000 Subject: [PATCH] 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. --- src/bootstrap/native.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 21dcb1d8aa0..c22c2a336f1 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -241,12 +241,8 @@ impl Step for Llvm { cfg.define("LLVM_VERSION_SUFFIX", suffix); } } else { - let mut default_suffix = - format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel,); - if let Some(sha) = llvm_info.sha_short() { - default_suffix.push_str("-"); - default_suffix.push_str(sha); - } + let default_suffix = + format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel); cfg.define("LLVM_VERSION_SUFFIX", default_suffix); }