summaryrefslogtreecommitdiff
path: root/bootstrap/rust-1.78/0001-Fix-LLVM-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap/rust-1.78/0001-Fix-LLVM-build.patch')
-rw-r--r--bootstrap/rust-1.78/0001-Fix-LLVM-build.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/bootstrap/rust-1.78/0001-Fix-LLVM-build.patch b/bootstrap/rust-1.78/0001-Fix-LLVM-build.patch
new file mode 100644
index 000000000..2e0799feb
--- /dev/null
+++ b/bootstrap/rust-1.78/0001-Fix-LLVM-build.patch
@@ -0,0 +1,22 @@
+From 855b7d97e96e67bd5db5c0016c3b9965a5c1843f 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/12] Fix LLVM build
+
+---
+ src/bootstrap/src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index 33b8f1a7ce720..d933a8bc37f88 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -1216,7 +1216,7 @@ impl Build {
+ .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 C++ on macOS then we add a flag indicating that