diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
| commit | 7b77e0c080a78c2525e286e41b3721393f79fa8f (patch) | |
| tree | 2580c195af5f6405fc74b0415211da14a416c39b /user/rust/0002-Fix-LLVM-build.patch | |
| parent | 8c2a854351b6ea35aed27d44baff826f400a0497 (diff) | |
| parent | fd100f124927cd65cf821bd5d538815e81034c1b (diff) | |
| download | packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.gz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.bz2 packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.xz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.33.0
See merge request !205
Diffstat (limited to 'user/rust/0002-Fix-LLVM-build.patch')
| -rw-r--r-- | user/rust/0002-Fix-LLVM-build.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch index 6938e0faf..7d12e84d3 100644 --- a/user/rust/0002-Fix-LLVM-build.patch +++ b/user/rust/0002-Fix-LLVM-build.patch @@ -1,26 +1,26 @@ -From d70cd5b6d304cc1b6d8f245460b27b8b0e0e6869 Mon Sep 17 00:00:00 2001 +From d44d2ca85013e85b2b72940609131d1229647461 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/23] Fix LLVM build +Subject: [PATCH 02/14] 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 ab3d0b5137..30e84bc13f 100644 +index 7491385af7..74c04bac6b 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -785,7 +785,8 @@ impl Build { +@@ -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<_>>(); + .collect::<Vec<String>>(); // If we're compiling on macOS then we add a few unconditional flags -- -2.19.2 +2.21.0 |