summaryrefslogtreecommitdiff
path: root/user/rust/0003-Fix-LLVM-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/rust/0003-Fix-LLVM-build.patch')
-rw-r--r--user/rust/0003-Fix-LLVM-build.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/user/rust/0003-Fix-LLVM-build.patch b/user/rust/0003-Fix-LLVM-build.patch
new file mode 100644
index 000000000..d2ca8526b
--- /dev/null
+++ b/user/rust/0003-Fix-LLVM-build.patch
@@ -0,0 +1,26 @@
+From 272bbaa5abe4f165a1f45ea1e9b33604af3ca77b Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Fri, 8 Sep 2017 00:04:29 -0500
+Subject: [PATCH 03/28] Fix LLVM build
+
+---
+ src/bootstrap/lib.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 1efff19dfb..e6ac847afe 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -742,7 +742,8 @@ impl Build {
+ // cc-rs because the build scripts will determine that for themselves.
+ let mut base = self.cc[&target].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<_>>();
+
+ // If we're compiling on macOS then we add a few unconditional flags
+--
+2.18.0
+