From ab614b0f010e68b74b8f8a6ce26d53302fb4f14a Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine97.martin@gmail.com>
Date: Tue, 13 Oct 2020 16:57:58 +0200
Subject: [PATCH 1/2] Implement "if-available" option for download-ci-llvm
---
src/bootstrap/bootstrap.py | 5 +++--
src/bootstrap/config.rs | 11 +++++++++--
src/bootstrap/defaults/config.compiler.toml | 5 +++++
src/bootstrap/defaults/config.library.toml | 5 +++++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 5c9184f450687..87b53df3c5f57 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -447,7 +447,8 @@ def download_stage0(self):
def downloading_llvm(self):
opt = self.get_toml('download-ci-llvm', 'llvm')
- return opt == "true"
+ return opt == "true" \
+ or (opt == "if-available" and self.build == "x86_64-unknown-linux-gnu")
def _download_stage0_helper(self, filename, pattern, tarball_suffix, date=None):
if date is None:
@@ -892,7 +893,7 @@ def update_submodules(self):
submodules_names = []
for module in submodules:
if module.endswith("llvm-project"):
- if self.get_toml('llvm-config') or self.get_toml('download-ci-llvm') == 'true':
+ if self.get_toml('llvm-config') or self.downloading_llvm():
if self.get_toml('lld') != 'true':
continue
check = self.check_submodule(module, slow_submodules)
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index db82155bd6ad2..3c1249f8de434 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -391,7 +391,7 @@ struct Llvm {
use_libcxx: Option<bool>,
use_linker: Option<String>,
allow_old_toolchain: Option<bool>,
- download_ci_llvm: Option<bool>,
+ download_ci_llvm: Option<StringOrBool>,
}
#[derive(Deserialize, Default, Clone, Merge)]
@@ -735,7 +735,14 @@ impl Config {
set(&mut config.llvm_use_libcxx, llvm.use_libcxx);
config.llvm_use_linker = llvm.use_linker.clone();
config.llvm_allow_old_toolchain = llvm.allow_old_toolchain;
- config.llvm_from_ci = llvm.download_ci_llvm.unwrap_or(false);
+ config.llvm_from_ci = match llvm.download_ci_llvm {
+ Some(StringOrBool::String(s)) => {
+ assert!(s == "if-available", "unknown option `{}` for download-ci-llvm", s);
+ config.build.triple == "x86_64-unknown-linux-gnu"
+ }
+ Some(StringOrBool::Bool(b)) => b,
+ None => false,
+ };
if config.llvm_from_ci {
// None of the LLVM options, except assertions, are supported
diff --git a/src/bootstrap/defaults/config.compiler.toml b/src/bootstrap/defaults/config.compiler.toml
index 4772de8a2cb22..0ca928843d589 100644
--- a/src/bootstrap/defaults/config.compiler.toml
+++ b/src/bootstrap/defaults/config.compiler.toml
@@ -6,3 +6,8 @@
debug-logging = true
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
incremental = true
+
+[llvm]
+# Will download LLVM from CI if available on your platform (Linux only for now)
+# https://github.com/rust-lang/rust/issues/77084 tracks support for more platforms
+download-ci-llvm = "if-available"
diff --git a/src/bootstrap/defaults/config.library.toml b/src/bootstrap/defaults/config.library.toml
index e4316f4d86440..9874fdb767f62 100644
--- a/src/bootstrap/defaults/config.library.toml
+++ b/src/bootstrap/defaults/config.library.toml
@@ -8,3 +8,8 @@ bench-stage = 0
[rust]
# This greatly increases the speed of rebuilds, especially when there are only minor changes. However, it makes the initial build slightly slower.
incremental = true
+
+[llvm]
+# Will download LLVM from CI if available on your platform (Linux only for now)
+# https://github.com/rust-lang/rust/issues/77084 tracks support for more platforms
+download-ci-llvm = "if-available"
From b8ae4c5e36d5ce36bf255dbaa66f64450b21efa5 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine97.martin@gmail.com>
Date: Tue, 13 Oct 2020 17:58:56 +0200
Subject: [PATCH 2/2] Handle included config in bootstrap.py
---
src/bootstrap/bootstrap.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 87b53df3c5f57..ce37adeb28c93 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -1004,6 +1004,16 @@ def bootstrap(help_triggered):
with open(toml_path) as config:
build.config_toml = config.read()
+ profile = build.get_toml('profile')
+ if profile is not None:
+ include_file = 'config.{}.toml'.format(profile)
+ include_dir = os.path.join(build.rust_root, 'src', 'bootstrap', 'defaults')
+ include_path = os.path.join(include_dir, include_file)
+ # HACK: This works because `build.get_toml()` returns the first match it finds for a
+ # specific key, so appending our defaults at the end allows the user to override them
+ with open(include_path) as included_toml:
+ build.config_toml += os.linesep + included_toml.read()
+
config_verbose = build.get_toml('verbose', 'build')
if config_verbose is not None:
build.verbose = max(build.verbose, int(config_verbose))