diff options
| author | Samuel Holland <samuel@sholland.org> | 2018-12-30 02:42:43 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2018-12-30 07:41:26 +0000 |
| commit | 3ad04696702c67ecbb84ee44d20b2489d77d841f (patch) | |
| tree | 3726f103454f5e932a342f1caad38eb459751d89 /user/rust/0004-Require-static-native-libraries-when-linking-static-.patch | |
| parent | 1f3a1b66721aa8c259d5f5ada4b5e55da526a2d6 (diff) | |
| download | packages-3ad04696702c67ecbb84ee44d20b2489d77d841f.tar.gz packages-3ad04696702c67ecbb84ee44d20b2489d77d841f.tar.bz2 packages-3ad04696702c67ecbb84ee44d20b2489d77d841f.tar.xz packages-3ad04696702c67ecbb84ee44d20b2489d77d841f.zip | |
user/rust: Bump to 1.31.1
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 | 12 |
1 files changed, 6 insertions, 6 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 e6f5304ec..cd01e4153 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 8912b0e6b881fda271f3805622442e4d5ac1e286 Mon Sep 17 00:00:00 2001 +From 4e6debd6806faf62ba737c01bb74080a637b127a 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/24] Require static native libraries when linking static +Subject: [PATCH 04/23] Require static native libraries when linking static executables gcc/ld will create a dynamically-linked executable without warning, even @@ -15,10 +15,10 @@ Fixes #54243 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 8248385c12..9fc1991412 100644 +index 86c6a5e65b..0e3ff6da07 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs -@@ -1592,8 +1592,8 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, +@@ -1588,8 +1588,8 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, } } @@ -29,7 +29,7 @@ index 8248385c12..9fc1991412 100644 // dependencies. We've got two cases then: // // 1. The upstream crate is an rlib. In this case we *must* link in the -@@ -1637,7 +1637,14 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, +@@ -1633,7 +1633,14 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, continue } match lib.kind { @@ -46,5 +46,5 @@ index 8248385c12..9fc1991412 100644 NativeLibraryKind::NativeStaticNobundle => { // Link "static-nobundle" native libs only if the crate they originate from -- -2.18.0 +2.19.2 |