1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 07a942a858b940f2a76e00d88f5c4df084685b33 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Mon, 16 Dec 2024 14:21:28 +0800
Subject: [PATCH 3/6] Patches - Add extra context to 1.74 patch file, hopefully
makes OSX happy. Ref #349
diff --git a/rustc-1.74.0-src.patch b/rustc-1.74.0-src.patch
index cacaa3dc..780afc6d 100644
--- a/rustc-1.74.0-src.patch
+++ b/rustc-1.74.0-src.patch
@@ -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);
@@ -107,7 +109,8 @@
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);
@@ -115,7 +118,9 @@
# 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! {
\ No newline at end of file
+ from_hex_array_impl! {
+
--
2.40.0
|
