26 lines
1 KiB
Diff
26 lines
1 KiB
Diff
From d2d990a812ef31f34c84325d33b0e42e900c8ebe 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/18] 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 39d7ea92..39cb804c 100644
|
|
--- a/src/bootstrap/lib.rs
|
|
+++ b/src/bootstrap/lib.rs
|
|
@@ -750,7 +750,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<String>>();
|
|
|
|
// If we're compiling on macOS then we add a few unconditional flags
|
|
--
|
|
2.24.0
|
|
|