summaryrefslogtreecommitdiff
path: root/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-03-21 22:34:00 -0500
committerSamuel Holland <samuel@sholland.org>2019-03-22 23:28:00 -0500
commitfd100f124927cd65cf821bd5d538815e81034c1b (patch)
tree380911715310d268c8c085a5f30f45f9195dd485 /user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch
parentedffe262c383c979833766a85cd65b74fb5231fa (diff)
downloadpackages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.gz
packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.bz2
packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.xz
packages-fd100f124927cd65cf821bd5d538815e81034c1b.zip
user/rust: Bump to 1.33.0
Diffstat (limited to 'user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch')
-rw-r--r--user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch
new file mode 100644
index 000000000..8d37b335c
--- /dev/null
+++ b/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch
@@ -0,0 +1,27 @@
+From 51b5ec642911295036d4ff19d4d6799037da3efc Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 24 Sep 2018 23:42:23 +0000
+Subject: [PATCH 12/14] 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 9f6db73e6f..69cc2219c1 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -208,7 +208,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
+