From ef440686131096e08635df418a70507bfc621a30 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 6 Sep 2018 11:06:32 +0200
Subject: [PATCH] rustbuild: allow configuring llvm version suffix
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
config.toml.example | 4 ++++
src/bootstrap/config.rs | 3 +++
src/bootstrap/native.rs | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/config.toml.example b/config.toml.example
index 35f69cd05b607..087dc418e2dce 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -82,6 +82,10 @@
# passed to prefer linking to shared libraries.
#link-shared = false
+# When building llvm, this configures what is being appended to the version.
+# If absent, we let the version as-is.
+#version-suffix = "-rust"
+
# On MSVC you can compile LLVM with clang-cl, but the test suite doesn't pass
# with clang-cl, so this is special in that it only compiles LLVM with clang-cl
#clang-cl = '/path/to/clang-cl.exe'
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index bf4d39c4947e5..70b21a1567b0f 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -86,6 +86,7 @@ pub struct Config {
pub llvm_targets: Option<String>,
pub llvm_experimental_targets: String,
pub llvm_link_jobs: Option<u32>,
+ pub llvm_version_suffix: Option<String>,
pub lld_enabled: bool,
pub lldb_enabled: bool,
@@ -256,6 +257,7 @@ struct Llvm {
experimental_targets: Option<String>,
link_jobs: Option<u32>,
link_shared: Option<bool>,
+ version_suffix: Option<String>,
clang_cl: Option<String>
}
@@ -516,6 +518,7 @@ impl Config {
config.llvm_experimental_targets = llvm.experimental_targets.clone()
.unwrap_or("WebAssembly;RISCV".to_string());
config.llvm_link_jobs = llvm.link_jobs;
+ config.llvm_version_suffix = llvm.version_suffix.clone();
config.llvm_clang_cl = llvm.clang_cl.clone();
}
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index caf38d766f54e..828a7d14c0437 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -239,6 +239,10 @@ impl Step for Llvm {
cfg.define("LLVM_NATIVE_BUILD", builder.llvm_out(builder.config.build).join("build"));
}
+ if let Some(ref suffix) = builder.config.llvm_version_suffix {
+ cfg.define("LLVM_VERSION_SUFFIX", suffix);
+ }
+
if let Some(ref python) = builder.config.python {
cfg.define("PYTHON_EXECUTABLE", python);
}