summaryrefslogtreecommitdiff
path: root/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-09-03 02:20:51 +0000
committerSamuel Holland <samuel@sholland.org>2019-09-07 09:32:30 -0500
commitbdb273539df454bdd85dcfb37f7c0135d33477f8 (patch)
tree5539e83f32aeef93da8384b47b71418bf1e3686b /user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch
parent7ff61b754950fa82d16e1bcbb458c54a38598f2a (diff)
downloadpackages-bdb273539df454bdd85dcfb37f7c0135d33477f8.tar.gz
packages-bdb273539df454bdd85dcfb37f7c0135d33477f8.tar.bz2
packages-bdb273539df454bdd85dcfb37f7c0135d33477f8.tar.xz
packages-bdb273539df454bdd85dcfb37f7c0135d33477f8.zip
user/rust: Bump to 1.37.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch')
-rw-r--r--user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch
new file mode 100644
index 000000000..47e9173a9
--- /dev/null
+++ b/user/rust/0014-Link-stage-2-tools-dynamically-to-libstd.patch
@@ -0,0 +1,27 @@
+From 8e160daedd1a8c928024db648c2f851cddbbd000 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 24 Sep 2018 23:42:23 +0000
+Subject: [PATCH 14/16] Link stage 2 tools dynamically to libstd
+
+---
+ src/bootstrap/tool.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
+index bd77f7a91d9..70477b44032 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -210,7 +210,9 @@ pub fn prepare_tool_cargo(
+
+ // We don't want to build tools dynamically as they'll be running across
+ // stages and such and it's just easier if they're not dynamically linked.
+- cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
++ if compiler.stage < 2 {
++ cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");
++ }
+
+ if source_type == SourceType::Submodule {
+ cargo.env("RUSTC_EXTERNAL_TOOL", "1");
+--
+2.21.0
+