20 lines
797 B
Diff
20 lines
797 B
Diff
From 99a046adc7d1c7b2da3a31e077722ea69f84eeb6 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/15] Fix LLVM build
|
|
|
|
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
|
index 33b8f1a7c..f4942dd2d 100644
|
|
--- a/src/bootstrap/src/lib.rs
|
|
+++ b/src/bootstrap/src/lib.rs
|
|
@@ -1195,7 +1195,8 @@ impl Build {
|
|
.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 C++ on macOS then we add a flag indicating that
|