diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
| commit | 097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch) | |
| tree | daa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0002-Fix-LLVM-build.patch | |
| parent | 950827890cca5caf633480047da6115f43b1a529 (diff) | |
| parent | 18b490b7953735328501c6f7e54522a91220caf3 (diff) | |
| download | packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2 packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1
See merge request !105
Diffstat (limited to 'user/rust/0002-Fix-LLVM-build.patch')
| -rw-r--r-- | user/rust/0002-Fix-LLVM-build.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch new file mode 100644 index 000000000..4780ff9a9 --- /dev/null +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -0,0 +1,26 @@ +From 67a4fbe55220b79ea80f3e0588fe77c729a70d3d 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/24] 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 6b88516bac..055a87efaa 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -772,7 +772,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<_>>(); + + // If we're compiling on macOS then we add a few unconditional flags +-- +2.18.0 + |