Tobias Kortkamp
03e6b89b6d
RLS is broken in nightly-2020-07-18 but that should not have aborted the package build. Add a workaround for the dist.missing-tools with build.tools bug. https://github.com/rust-lang/rust/issues/74545
21 lines
746 B
Rust
21 lines
746 B
Rust
https://github.com/rust-lang/rust/issues/74545
|
|
|
|
--- src/bootstrap/install.rs.orig 2020-07-20 14:00:24 UTC
|
|
+++ src/bootstrap/install.rs
|
|
@@ -112,9 +112,14 @@ fn install_sh(
|
|
pkgname(builder, name)
|
|
};
|
|
|
|
+ let install_script = tmpdir(builder).join(&package_name).join("install.sh");
|
|
+ if !install_script.exists() {
|
|
+ return;
|
|
+ }
|
|
+
|
|
let mut cmd = Command::new("sh");
|
|
cmd.current_dir(&empty_dir)
|
|
- .arg(sanitize_sh(&tmpdir(builder).join(&package_name).join("install.sh")))
|
|
+ .arg(sanitize_sh(&install_script))
|
|
.arg(format!("--prefix={}", sanitize_sh(&prefix)))
|
|
.arg(format!("--sysconfdir={}", sanitize_sh(&sysconfdir)))
|
|
.arg(format!("--datadir={}", sanitize_sh(&datadir)))
|