Skip to content

Commit ea7c8d9

Browse files
committed
Also, fix 0011 patch to Cargo.lock (it was adding the embed-manifest dependency to the wrong crate due to fuzziness), and add a patch to vendor embed-manifest. This allows CLANG32 to build with --enable-vendor, which is required to use our now-patched version of compiler-builtins.
1 parent 00be594 commit ea7c8d9

4 files changed

+2122
-22
lines changed

mingw-w64-rust/0011-disable-uac-for-installer.patch

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
2-
--- rustc-1.72.0-src/Cargo.lock.orig 2023-08-21 16:57:17.000000000 +0200
3-
+++ rustc-1.72.0-src/Cargo.lock 2023-08-23 14:37:30.805984900 +0200
4-
@@ -323,6 +323,7 @@
5-
version = "0.1.0"
6-
dependencies = [
7-
"anyhow",
8-
+ "embed-manifest",
9-
"flate2",
10-
"hex",
11-
"rayon",
12-
@@ -986,6 +987,12 @@
1+
diff -urN rustc-1.77.0-src/Cargo.lock.orig rustc-1.77.0-src/Cargo.lock
2+
--- rustc-1.77.0-src/Cargo.lock.orig 2024-03-17 12:03:00.000000000 -0700
3+
+++ rustc-1.77.0-src/Cargo.lock 2024-03-25 11:14:51.855058900 -0700
4+
@@ -1211,6 +1211,12 @@
135
]
146

157
[[package]]
@@ -22,6 +14,14 @@ diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
2214
name = "ena"
2315
version = "0.14.2"
2416
source = "registry+https://github.com/rust-lang/crates.io-index"
17+
@@ -2011,6 +2017,7 @@
18+
dependencies = [
19+
"anyhow",
20+
"clap",
21+
+ "embed-manifest",
22+
"flate2",
23+
"rayon",
24+
"tar",
2525
diff -urN rustc-1.64.0-src.orig/src/tools/rust-installer/build.rs rustc-1.64.0-src/src/tools/rust-installer/build.rs
2626
--- rustc-1.64.0-src.orig/src/tools/rust-installer/build.rs 1970-01-01 01:00:00.000000000 +0100
2727
+++ rustc-1.64.0-src/src/tools/rust-installer/build.rs 2022-11-08 00:18:24.231485300 +0100

mingw-w64-rust/0012-backport-compiler-builtins.patch

+131
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)