From 02bae9a59de4e38001272219b8a9909549c12df8 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 8 Sep 2017 00:04:29 -0500 Subject: [PATCH 02/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 b72aa78f3de..3374c88550a 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -768,7 +768,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::>(); // If we're compiling on macOS then we add a few unconditional flags -- 2.21.0