From 03e6b89b6deb7c39565f31c902e8ce7498ae6364 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Mon, 20 Jul 2020 17:52:06 +0000 Subject: lang/rust-nightly: Unbreak build 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 --- .../files/patch-src_bootstrap_install.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lang/rust-nightly/files/patch-src_bootstrap_install.rs (limited to 'lang/rust-nightly/files/patch-src_bootstrap_install.rs') diff --git a/lang/rust-nightly/files/patch-src_bootstrap_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_install.rs new file mode 100644 index 000000000000..ac89792be1f9 --- /dev/null +++ b/lang/rust-nightly/files/patch-src_bootstrap_install.rs @@ -0,0 +1,20 @@ +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))) -- cgit v1.2.3