let mut rev_list = Command::new("git");
rev_list.args(&[
PathBuf::from("rev-list"),
- "--author=bors@rust-lang.org".into(),
+ format!("--author={}", builder.config.stage0_metadata.config.git_merge_commit_email).into(),
"-n1".into(),
"--first-parent".into(),
"HEAD".into(),
if !rustc_cache.exists() {
t!(fs::create_dir_all(&rustc_cache));
}
- let base = "https://ci-artifacts.rust-lang.org";
- let url = if llvm_assertions {
- format!("rustc-builds-alt/{}", llvm_sha)
+ let base = if llvm_assertions {
+ &builder.config.stage0_metadata.config.artifacts_with_llvm_assertions_server
} else {
- format!("rustc-builds/{}", llvm_sha)
+ &builder.config.stage0_metadata.config.artifacts_server
};
let filename = format!("rust-dev-nightly-{}.tar.xz", builder.build.build.triple);
let tarball = rustc_cache.join(&filename);
if !tarball.exists() {
- let help_on_error = "error: failed to download llvm from ci\n
-\nhelp: old builds get deleted after a certain time
-\nhelp: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
-\n
-\n[llvm]
-\ndownload-ci-llvm = false
-\n
+ let help_on_error = "error: failed to download llvm from ci
+
+help: old builds get deleted after a certain time
+help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
+
+[llvm]
+download-ci-llvm = false
";
- builder.download_component(base, &format!("{}/{}", url, filename), &tarball, help_on_error);
+ builder.download_component(
+ &format!("{base}/{llvm_sha}/{filename}"),
+ &tarball,
+ help_on_error,
+ );
}
let llvm_root = builder.config.ci_llvm_root();
builder.unpack(&tarball, &llvm_root, "rust-dev");
cfg.define("LLVM_ENABLE_ZLIB", "OFF");
}
- // Are we compiling for iOS/tvOS?
- if target.contains("apple-ios") || target.contains("apple-tvos") {
+ // Are we compiling for iOS/tvOS/watchOS?
+ if target.contains("apple-ios")
+ || target.contains("apple-tvos")
+ || target.contains("apple-watchos")
+ {
// These two defines prevent CMake from automatically trying to add a MacOSX sysroot, which leads to a compiler error.
cfg.define("CMAKE_OSX_SYSROOT", "/");
cfg.define("CMAKE_OSX_DEPLOYMENT_TARGET", "");
// For distribution we want the LLVM tools to be *statically* linked to libstdc++.
// We also do this if the user explicitly requested static libstdc++.
if builder.config.llvm_static_stdcpp {
- if !target.contains("msvc") && !target.contains("netbsd") {
+ if !target.contains("msvc") && !target.contains("netbsd") && !target.contains("solaris") {
if target.contains("apple") || target.contains("windows") {
ldflags.push_all("-static-libstdc++");
} else {