summaryrefslogtreecommitdiff
path: root/user/rust/0001-Fix-LLVM-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/rust/0001-Fix-LLVM-build.patch')
-rw-r--r--user/rust/0001-Fix-LLVM-build.patch21
1 files changed, 9 insertions, 12 deletions
diff --git a/user/rust/0001-Fix-LLVM-build.patch b/user/rust/0001-Fix-LLVM-build.patch
index 3be2eb456..67ad9dbf8 100644
--- a/user/rust/0001-Fix-LLVM-build.patch
+++ b/user/rust/0001-Fix-LLVM-build.patch
@@ -1,17 +1,17 @@
-From 1a5423cf2c7eb0784fcc9b789cdd271efbf43d45 Mon Sep 17 00:00:00 2001
+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/14] Fix LLVM build
+Subject: [PATCH 01/12] Fix LLVM build
---
- src/bootstrap/lib.rs | 2 +-
+ src/bootstrap/src/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
+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
+@@ -1262,7 +1262,7 @@ impl Build {
.args()
.iter()
.map(|s| s.to_string_lossy().into_owned())
@@ -19,7 +19,4 @@ index 3130dcc277b..c6ac4f9e636 100644
+ .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
-
+ // If we're compiling C++ on macOS then we add a flag indicating that