mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-03-27 08:22:25 +01:00
4cc843c46d
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html * base.crt_static_default from linux_musl.rs in musl-fix-linux_musl_base.patch, was moved to the indivdual targets (which we already do in alpine-target.patch)9c37c14aa2* Target JSON (de)serialization was moved from compiler/rustc_target/src/spec/mod.rs to compiler/rustc_target/src/spec/json.rs (need-rpath.patch)77080d8eb3
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
Patch-Source: https://github.com/rust-lang/rust/pull/137338
|
|
---
|
|
From d2203ad59c67a6acb2968ea77e1e9dea5530e518 Mon Sep 17 00:00:00 2001
|
|
From: onur-ozkan <work@onurozkan.dev>
|
|
Date: Thu, 20 Feb 2025 22:48:39 +0300
|
|
Subject: [PATCH] skip submodule updating logics on tarballs
|
|
|
|
Signed-off-by: onur-ozkan <work@onurozkan.dev>
|
|
---
|
|
src/bootstrap/src/core/config/config.rs | 2 +-
|
|
src/bootstrap/src/lib.rs | 4 ++++
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
|
index 64a510240f837..172b8d787640d 100644
|
|
--- a/src/bootstrap/src/core/config/config.rs
|
|
+++ b/src/bootstrap/src/core/config/config.rs
|
|
@@ -2767,7 +2767,7 @@ impl Config {
|
|
),
|
|
)]
|
|
pub(crate) fn update_submodule(&self, relative_path: &str) {
|
|
- if !self.submodules() {
|
|
+ if self.rust_info.is_from_tarball() || !self.submodules() {
|
|
return;
|
|
}
|
|
|
|
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
|
index dfaf0418d9a2b..a0934a8d55663 100644
|
|
--- a/src/bootstrap/src/lib.rs
|
|
+++ b/src/bootstrap/src/lib.rs
|
|
@@ -481,6 +481,10 @@ impl Build {
|
|
),
|
|
)]
|
|
pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
|
|
+ if self.rust_info().is_from_tarball() {
|
|
+ return;
|
|
+ }
|
|
+
|
|
// When testing bootstrap itself, it is much faster to ignore
|
|
// submodules. Almost all Steps work fine without their submodules.
|
|
if cfg!(test) && !self.config.submodules() {
|