Skip to content

Commit

Permalink
Patches - Add extra context to 1.74 patch file, hopefully makes OSX h…
Browse files Browse the repository at this point in the history
…appy. Ref #349
  • Loading branch information
thepowersgang committed Dec 16, 2024
1 parent ddd2642 commit 07a942a
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions rustc-1.74.0-src.patch
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@
mod size_asserts {
--- compiler/rustc_middle/src/mir/consts.rs
+++ compiler/rustc_middle/src/mir/consts.rs
@@ -73,2 +73,2 @@
@@ -73,3 +73,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
static_assert_size!(ConstValue<'_>, 24);
--- compiler/rustc_middle/src/mir/interpret/value.rs
+++ compiler/rustc_middle/src/mir/interpret/value.rs
@@ -37,2 +37,2 @@
@@ -37,3 +37,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
static_assert_size!(Scalar, 24);
Expand All @@ -107,15 +109,18 @@
mod size_asserts {
--- compiler/rustc_middle/src/ty/consts/kind.rs
+++ compiler/rustc_middle/src/ty/consts/kind.rs
@@ -75,2 +75,2 @@
@@ -75,3 +75,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
static_assert_size!(Expr<'_>, 24);

# MSVC Cannot handle structs larger than 32-bit, so disable this for windows with mrustc
--- vendor/hex/src/lib.rs
+++ vendor/hex/src/lib.rs
@@ -239,2 +239,2 @@
@@ -239,3 +239,3 @@

-#[cfg(target_pointer_width = "64")]
+#[cfg(all(target_pointer_width = "64", not(rust_compiler = "mrustc")))]
from_hex_array_impl! {
from_hex_array_impl! {

0 comments on commit 07a942a

Please sign in to comment.