From 36ba9dd47f31bfbe4811b03df9a2871c43857219 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 30 Apr 2022 04:27:44 +0000
Subject: user/rust: Bump to 1.60.0

Signed-off-by: Samuel Holland <samuel@sholland.org>
---
 user/rust/0001-Fix-LLVM-build.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 user/rust/0001-Fix-LLVM-build.patch

(limited to 'user/rust/0001-Fix-LLVM-build.patch')

diff --git a/user/rust/0001-Fix-LLVM-build.patch b/user/rust/0001-Fix-LLVM-build.patch
new file mode 100644
index 000000000..3be2eb456
--- /dev/null
+++ b/user/rust/0001-Fix-LLVM-build.patch
@@ -0,0 +1,25 @@
+From 1a5423cf2c7eb0784fcc9b789cdd271efbf43d45 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Fri, 8 Sep 2017 00:04:29 -0500
+Subject: [PATCH 01/14] Fix LLVM build
+
+---
+ src/bootstrap/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 3130dcc277b..c6ac4f9e636 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -957,7 +957,7 @@ fn cflags(&self, target: TargetSelection, which: GitRepo, c: CLang) -> Vec<Strin
+             .args()
+             .iter()
+             .map(|s| s.to_string_lossy().into_owned())
+-            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
++            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O") && !s.starts_with("-static"))
+             .collect::<Vec<String>>();
+ 
+         // If we're compiling on macOS then we add a few unconditional flags
+-- 
+2.35.1
+
-- 
cgit v1.2.3-60-g2f50