diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
| tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0002-Fix-LLVM-build.patch | |
| parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
| download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip | |
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0002-Fix-LLVM-build.patch')
| -rw-r--r-- | user/rust/0002-Fix-LLVM-build.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/user/rust/0002-Fix-LLVM-build.patch b/user/rust/0002-Fix-LLVM-build.patch deleted file mode 100644 index 25d8355fc..000000000 --- a/user/rust/0002-Fix-LLVM-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 02bae9a59de4e38001272219b8a9909549c12df8 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/18] 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 b72aa78f3de..3374c88550a 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -768,7 +768,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 - |