Skip to content

Commit 5bca74e

Browse files
committed
rust: add patch to permit install when using external LLVM.
Picked up from rust-lang/rust#109256
1 parent c9e0d69 commit 5bca74e

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

rust/distinfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766
130130
SHA1 (patch-src_bootstrap_bootstrap.py) = fdb4e2e7fd61ae10f4f4b06ef895a8ebf47fbf7a
131131
SHA1 (patch-src_bootstrap_builder.rs) = 98daac929d2bbc9c475c39d225d50d37491528a8
132132
SHA1 (patch-src_bootstrap_compile.rs) = 94b05db59b8bc50dce48537aeb72ba9ce293bb07
133+
SHA1 (patch-src_bootstrap_install.rs) = 5b10a2706d67096791f25c723721cb4824fd584f
133134
SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
134135
SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
135136
SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
$NetBSD$
2+
3+
Apply fix from https://github.com/rust-lang/rust/pull/109256.
4+
5+
--- src/bootstrap/install.rs.orig 2023-03-21 21:31:48.458992230 +0000
6+
+++ src/bootstrap/install.rs
7+
@@ -210,10 +210,13 @@ install!((self, builder, _config),
8+
}
9+
};
10+
LlvmTools, alias = "llvm-tools", Self::should_build(_config), only_hosts: true, {
11+
- let tarball = builder
12+
- .ensure(dist::LlvmTools { target: self.target })
13+
- .expect("missing llvm-tools");
14+
- install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
15+
+ if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) {
16+
+ install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
17+
+ } else {
18+
+ builder.info(
19+
+ &format!("skipping llvm-tools stage{} ({}): external LLVM", self.compiler.stage, self.target),
20+
+ );
21+
+ }
22+
};
23+
Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts: true, {
24+
if let Some(tarball) = builder.ensure(dist::Rustfmt {

0 commit comments

Comments
 (0)