backport cargo build-std patches

esp-rs · Oct 30, 2024 · a87c055 · a87c055
1 parent 99918b7
commit a87c055
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,8 +4,9 @@
 	shallow = true
 [submodule "src/tools/cargo"]
 	path = src/tools/cargo
-	url = https://github.com/rust-lang/cargo.git
+	url = https://github.com/MabezDev/cargo
 	shallow = true
+	branch = esp-1.82.0.0-backport
 [submodule "src/doc/reference"]
 	path = src/doc/reference
 	url = https://github.com/rust-lang/reference.git

diff --git a/src/tools/cargo b/src/tools/cargo
+5 −54		src/cargo/core/compiler/standard_lib.rs
+0 −19		src/cargo/core/workspace.rs
+25 −2		tests/build-std/main.rs
+0 −8		tests/testsuite/mock-std/Cargo.toml
+11 −0		tests/testsuite/mock-std/library/Cargo.toml
+1 −1		tests/testsuite/standard_lib.rs