diff options
| author | Randy Barlow <randy@electronsweatshop.com> | 2024-01-30 21:14:29 -0500 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-02-10 04:48:55 +0000 |
| commit | 83a308fe5493162778df3d963bc5c224b3f97f9b (patch) | |
| tree | e7232e4d0b7b3aceb1b6f732229e6edcb838aa8f /dev-lang/rust/files/1.75.0-handle-vendored-sources.patch | |
| parent | a3c7956ab9ff86f75efe059dc02eb28583534ca2 (diff) | |
| download | gentoo-83a308fe5493162778df3d963bc5c224b3f97f9b.tar.gz gentoo-83a308fe5493162778df3d963bc5c224b3f97f9b.tar.bz2 gentoo-83a308fe5493162778df3d963bc5c224b3f97f9b.zip | |
dev-lang/rust: Add 1.75
Bug: https://bugs.gentoo.org/922880
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/rust/files/1.75.0-handle-vendored-sources.patch')
| -rw-r--r-- | dev-lang/rust/files/1.75.0-handle-vendored-sources.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-lang/rust/files/1.75.0-handle-vendored-sources.patch b/dev-lang/rust/files/1.75.0-handle-vendored-sources.patch new file mode 100644 index 000000000000..c68ceba15e82 --- /dev/null +++ b/dev-lang/rust/files/1.75.0-handle-vendored-sources.patch @@ -0,0 +1,45 @@ +From 4b7e0a0b56aa2446e670dfd6558380a1039a86aa Mon Sep 17 00:00:00 2001 +From: Arlo Siemsen <arsiem@microsoft.com> +Date: Thu, 4 Jan 2024 11:40:56 -0600 +Subject: [PATCH] Handle vendored sources when remapping paths + +Signed-off-by: Randy Barlow <randy@electronsweatshop.com> +--- + src/bootstrap/src/core/builder.rs | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index 4e20babc55a..3770d0687b2 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -1799,15 +1799,20 @@ pub fn cargo( + } + + if self.config.rust_remap_debuginfo { +- // FIXME: handle vendored sources +- let registry_src = t!(home::cargo_home()).join("registry").join("src"); + let mut env_var = OsString::new(); +- for entry in t!(std::fs::read_dir(registry_src)) { +- if !env_var.is_empty() { +- env_var.push("\t"); +- } +- env_var.push(t!(entry).path()); ++ if self.config.vendor { ++ let vendor = self.build.src.join("vendor"); ++ env_var.push(vendor); + env_var.push("=/rust/deps"); ++ } else { ++ let registry_src = t!(home::cargo_home()).join("registry").join("src"); ++ for entry in t!(std::fs::read_dir(registry_src)) { ++ if !env_var.is_empty() { ++ env_var.push("\t"); ++ } ++ env_var.push(t!(entry).path()); ++ env_var.push("=/rust/deps"); ++ } + } + cargo.env("RUSTC_CARGO_REGISTRY_SRC_TO_REMAP", env_var); + } +-- +2.43.0 + |
