Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jeremyd2019 authored and filnet committed Mar 28, 2024
1 parent 3eff2aa commit aceb5ea
Show file tree
Hide file tree
Showing 4 changed files with 2,122 additions and 22 deletions.
24 changes: 12 additions & 12 deletions mingw-w64-rust/0011-disable-uac-for-installer.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
--- rustc-1.72.0-src/Cargo.lock.orig 2023-08-21 16:57:17.000000000 +0200
+++ rustc-1.72.0-src/Cargo.lock 2023-08-23 14:37:30.805984900 +0200
@@ -323,6 +323,7 @@
version = "0.1.0"
dependencies = [
"anyhow",
+ "embed-manifest",
"flate2",
"hex",
"rayon",
@@ -986,6 +987,12 @@
diff -urN rustc-1.77.0-src/Cargo.lock.orig rustc-1.77.0-src/Cargo.lock
--- rustc-1.77.0-src/Cargo.lock.orig 2024-03-17 12:03:00.000000000 -0700
+++ rustc-1.77.0-src/Cargo.lock 2024-03-25 11:14:51.855058900 -0700
@@ -1211,6 +1211,12 @@
]

[[package]]
Expand All @@ -22,6 +14,14 @@ diff -urN rustc-1.72.0-src/Cargo.lock.orig rustc-1.72.0-src/Cargo.lock
name = "ena"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2011,6 +2017,7 @@
dependencies = [
"anyhow",
"clap",
+ "embed-manifest",
"flate2",
"rayon",
"tar",
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
--- rustc-1.64.0-src.orig/src/tools/rust-installer/build.rs 1970-01-01 01:00:00.000000000 +0100
+++ rustc-1.64.0-src/src/tools/rust-installer/build.rs 2022-11-08 00:18:24.231485300 +0100
Expand Down
131 changes: 131 additions & 0 deletions mingw-w64-rust/0012-backport-compiler-builtins.patch

Large diffs are not rendered by default.

Loading

0 comments on commit aceb5ea

Please sign in to comment.