Rollup merge of #93756 - tmandry:llvm-build-config, r=Mark-Simulacrum

Support custom options for LLVM build

The LLVM build has a lot of options that rustbuild doesn't need to know about. We should allow the user to customize the LLVM build directly.

Here are some [example customizations][recipe] we'd like to do.

[recipe]: 90105e5e4e/recipes/contrib/clang_toolchain.py (579)
This commit is contained in:
Matthias Krüger 2022-02-10 12:09:56 +01:00 committed by GitHub
commit 584948d1be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions

View file

@ -157,6 +157,9 @@ changelog-seen = 2
# Whether to build the clang compiler.
#clang = false
# Custom CMake defines to set when building LLVM.
#build-config = {}
# =============================================================================
# General build configuration options
# =============================================================================

View file

@ -108,6 +108,7 @@ pub struct Config {
pub llvm_polly: bool,
pub llvm_clang: bool,
pub llvm_from_ci: bool,
pub llvm_build_config: HashMap<String, String>,
pub use_lld: bool,
pub lld_enabled: bool,
@ -477,6 +478,7 @@ struct Llvm {
polly: Option<bool>,
clang: Option<bool>,
download_ci_llvm: Option<StringOrBool>,
build_config: Option<HashMap<String, String>>,
}
}
@ -807,6 +809,7 @@ pub fn parse(args: &[String]) -> Config {
config.llvm_allow_old_toolchain = llvm.allow_old_toolchain.unwrap_or(false);
config.llvm_polly = llvm.polly.unwrap_or(false);
config.llvm_clang = llvm.clang.unwrap_or(false);
config.llvm_build_config = llvm.build_config.clone().unwrap_or(Default::default());
config.llvm_from_ci = match llvm.download_ci_llvm {
Some(StringOrBool::String(s)) => {
assert!(s == "if-available", "unknown option `{}` for download-ci-llvm", s);
@ -876,6 +879,7 @@ pub fn parse(args: &[String]) -> Config {
check_ci_llvm!(llvm.allow_old_toolchain);
check_ci_llvm!(llvm.polly);
check_ci_llvm!(llvm.clang);
check_ci_llvm!(llvm.build_config);
check_ci_llvm!(llvm.plugins);
// CI-built LLVM can be either dynamic or static.

View file

@ -353,6 +353,10 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
configure_cmake(builder, target, &mut cfg, true);
for (key, val) in &builder.config.llvm_build_config {
cfg.define(key, val);
}
// FIXME: we don't actually need to build all LLVM tools and all LLVM
// libraries here, e.g., we just want a few components and a few
// tools. Figure out how to filter them down and only build the right