summaryrefslogtreecommitdiff
path: root/user/rust/0001-Require-static-native-libraries-when-linking-static-.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-11-10 22:34:26 +0000
committerSamuel Holland <samuel@sholland.org>2018-11-13 02:03:14 +0000
commit18b490b7953735328501c6f7e54522a91220caf3 (patch)
treef075f78e11183fb78348b69d07affde16b828d81 /user/rust/0001-Require-static-native-libraries-when-linking-static-.patch
parent939576404a1853bf009789059c34288420bfd6ec (diff)
downloadpackages-18b490b7953735328501c6f7e54522a91220caf3.tar.gz
packages-18b490b7953735328501c6f7e54522a91220caf3.tar.bz2
packages-18b490b7953735328501c6f7e54522a91220caf3.tar.xz
packages-18b490b7953735328501c6f7e54522a91220caf3.zip
user/rust: Bump to 1.30.1
Diffstat (limited to 'user/rust/0001-Require-static-native-libraries-when-linking-static-.patch')
-rw-r--r--user/rust/0001-Require-static-native-libraries-when-linking-static-.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/user/rust/0001-Require-static-native-libraries-when-linking-static-.patch b/user/rust/0001-Require-static-native-libraries-when-linking-static-.patch
deleted file mode 100644
index a9638ee75..000000000
--- a/user/rust/0001-Require-static-native-libraries-when-linking-static-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9cee7b92ea492f9a879c88ae0ca2c1f791bdec97 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Fri, 8 Sep 2017 00:05:18 -0500
-Subject: [PATCH 01/29] Require static native libraries when linking static
- executables
-
----
- 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 845a66c6e4..f61318affc 100644
---- a/src/librustc_codegen_llvm/back/link.rs
-+++ b/src/librustc_codegen_llvm/back/link.rs
-@@ -1551,8 +1551,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
-@@ -1596,7 +1596,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::CrateTypeExecutable && 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.18.0
-