1 files changed, 0 insertions, 50 deletions
diff --git a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
deleted file mode 100644
index 6ec5eb76f..000000000
--- a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 46e6ead56b2899d9041fe73c1530b7f02df2ca40 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Fri, 8 Sep 2017 00:05:18 -0500
-Subject: [PATCH 04/14] Require static native libraries when linking static
- executables
-
-gcc/ld will create a dynamically-linked executable without warning, even
-when passed `-static`, when asked to link to a `.so`. Avoid this
-confusing and unintended behavior by always using the static version of
-libraries when trying to link static executables.
-
-Fixes #54243
----
- src/librustc_codegen_llvm/back/link.rs | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs
-index fc744201a3..bae8b6ed75 100644
---- a/src/librustc_codegen_llvm/back/link.rs
-+++ b/src/librustc_codegen_llvm/back/link.rs
-@@ -1413,8 +1413,8 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker,
-     }
- }
- 
--// Link in all of our upstream crates' native dependencies. Remember that
--// all of these upstream native dependencies are all non-static
-+// Link in all of our upstream crates' native dependencies. Remember that when
-+// linking libraries, these upstream native dependencies are all non-static
- // dependencies. We've got two cases then:
- //
- // 1. The upstream crate is an rlib. In this case we *must* link in the
-@@ -1458,7 +1458,14 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker,
-                 continue
-             }
-             match lib.kind {
--                NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()),
-+                NativeLibraryKind::NativeUnknown => {
-+                    // When creating executables, match library linkage to that of the executable.
-+                    if crate_type == config::CrateType::Executable && sess.crt_static() {
-+                        cmd.link_staticlib(&name.as_str())
-+                    } else {
-+                        cmd.link_dylib(&name.as_str())
-+                    }
-+                },
-                 NativeLibraryKind::NativeFramework => cmd.link_framework(&name.as_str()),
-                 NativeLibraryKind::NativeStaticNobundle => {
-                     // Link "static-nobundle" native libs only if the crate they originate from
--- 
-2.21.0
-