diff options
| author | Matt Jolly <kangie@gentoo.org> | 2025-05-31 16:23:15 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2025-06-04 07:36:56 +1000 |
| commit | 057daa00036e040231855c45bc2bba039c29cb53 (patch) | |
| tree | 8039c2610a50790596fd79ac460c42cdbe762f1b /dev-lang/rust/files/1.75.0-handle-vendored-sources.patch | |
| parent | 388cbca2dd4f4826e9bb99f89b2bb1808e84de52 (diff) | |
| download | gentoo-057daa00036e040231855c45bc2bba039c29cb53.tar.gz gentoo-057daa00036e040231855c45bc2bba039c29cb53.tar.bz2 gentoo-057daa00036e040231855c45bc2bba039c29cb53.zip | |
dev-lang/rust: stop using FILESDIR
files/ has been too big for a while now. Instead use the rust-patches
repository that was created to manage these patches.
No revbumps required - they were either done beforehand when we dropped
a bad patch _or_ are not required as the only additions are backported
build-time fixes (done in previous commits).
Signed-off-by: Matt Jolly <kangie@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, 0 insertions, 45 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 deleted file mode 100644 index c68ceba15e82..000000000000 --- a/dev-lang/rust/files/1.75.0-handle-vendored-sources.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |
