summaryrefslogblamecommitdiff
path: root/user/rust/0002-Fix-LLVM-build.patch
blob: 7209c3c75be7a78f6202d65ec7ae712263776e20 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
                                                                      

                                          
                                     





                                                        
                                     

                          
                                





                                                                                     
                                                      


                                                                             
      
 
From 93c87d4cf5ef70813b8e909cdc04527b1f5d7555 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 8 Sep 2017 00:04:29 -0500
Subject: [PATCH 02/12] 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 ca4489655ca..7618a6e6df5 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -774,7 +774,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.21.0