diff options
author | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:42:59 +0000 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:46:40 +0000 |
commit | 7e1cca3044a2ec11b12b1e0004eb59be38950bed (patch) | |
tree | 21773e07accb1d9b9c49a95dc2975aa04867c479 /user/rust/0004-Require-static-native-libraries-when-linking-static-.patch | |
parent | d726062dd22ef3eaafd366821fb7c9dde338f060 (diff) | |
download | packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.gz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.bz2 packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.xz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.zip |
user/rust: Bump to 1.35.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-.patch | 10 |
1 files changed, 5 insertions, 5 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 6238e5058..a1ee6c661 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 859624e56281aff33673dcceb34698bd30eceea3 Mon Sep 17 00:00:00 2001 +From 7f7ea1cba86a15510de2410529c8460fc5b7018b 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 +Subject: [PATCH 04/13] Require static native libraries when linking static executables On ELF targets like Linux, gcc/ld will create a dynamically-linked @@ -16,10 +16,10 @@ Fixes #54243 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 819f7f9410..49adc5dfca 100644 +index 19419a72b9..9d26dd0b35 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs -@@ -1413,9 +1413,7 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, +@@ -1408,9 +1408,7 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, } } @@ -30,7 +30,7 @@ index 819f7f9410..49adc5dfca 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. -@@ -1458,7 +1456,19 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, +@@ -1453,7 +1451,19 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, continue } match lib.kind { |