summaryrefslogtreecommitdiff
path: root/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-07-05 23:26:12 -0500
committerSamuel Holland <samuel@sholland.org>2019-09-05 02:05:29 +0000
commit7ff61b754950fa82d16e1bcbb458c54a38598f2a (patch)
tree15c91da7a3615df6c9dc7dad00b50ba4ddb813d7 /user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
parent1c147dccb8b8b31fbc830e963f301e99ebc25d8d (diff)
downloadpackages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.gz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.bz2
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.xz
packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.zip
user/rust: Bump to 1.36.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0004-Require-static-native-libraries-when-linking-static-.patch')
-rw-r--r--user/rust/0004-Require-static-native-libraries-when-linking-static-.patch18
1 files changed, 9 insertions, 9 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
index a1ee6c661..e8fada6be 100644
--- a/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
+++ b/user/rust/0004-Require-static-native-libraries-when-linking-static-.patch
@@ -1,7 +1,7 @@
-From 7f7ea1cba86a15510de2410529c8460fc5b7018b Mon Sep 17 00:00:00 2001
+From 41de62cd1f5e6326987cd9ec625b8ed06efa3041 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/13] Require static native libraries when linking static
+Subject: [PATCH 04/12] Require static native libraries when linking static
executables
On ELF targets like Linux, gcc/ld will create a dynamically-linked
@@ -12,14 +12,14 @@ executables.
Fixes #54243
---
- src/librustc_codegen_llvm/back/link.rs | 18 ++++++++++++++----
+ src/librustc_codegen_ssa/back/link.rs | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
-diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs
-index 19419a72b9..9d26dd0b35 100644
---- a/src/librustc_codegen_llvm/back/link.rs
-+++ b/src/librustc_codegen_llvm/back/link.rs
-@@ -1408,9 +1408,7 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker,
+diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
+index d5a56f6a09e..bb06d80d814 100644
+--- a/src/librustc_codegen_ssa/back/link.rs
++++ b/src/librustc_codegen_ssa/back/link.rs
+@@ -1548,9 +1548,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
}
}
@@ -30,7 +30,7 @@ index 19419a72b9..9d26dd0b35 100644
//
// 1. The upstream crate is an rlib. In this case we *must* link in the
// native dependency because the rlib is just an archive.
-@@ -1453,7 +1451,19 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker,
+@@ -1593,7 +1591,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
continue
}
match lib.kind {