2cab55965b
Also remove option static_llvm and add option bindist, which helps simplify building bootstrap tarballs.
26 lines
871 B
Diff
26 lines
871 B
Diff
From 4443eca0d6b3ba599832b2f73a5350fdd0c90d10 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
|
|
|
|
---
|
|
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 a476d25f..c7e63990 100644
|
|
--- a/src/bootstrap/lib.rs
|
|
+++ b/src/bootstrap/lib.rs
|
|
@@ -768,7 +768,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 on macOS then we add a few unconditional flags
|
|
--
|
|
2.26.2
|
|
|