From 3ad04696702c67ecbb84ee44d20b2489d77d841f Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 30 Dec 2018 02:42:43 +0000 Subject: user/rust: Bump to 1.31.1 --- ...-Link-stage-2-tools-dynamically-to-libstd.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch (limited to 'user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch') diff --git a/user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch new file mode 100644 index 000000000..dfb43d9b7 --- /dev/null +++ b/user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch @@ -0,0 +1,27 @@ +From 0aac206a1c7af54f5974eb4043b0f821720f4bf7 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Mon, 24 Sep 2018 23:42:23 +0000 +Subject: [PATCH 21/23] 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 6868a063ce..3a91b4fa07 100644 +--- a/src/bootstrap/tool.rs ++++ b/src/bootstrap/tool.rs +@@ -217,7 +217,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.19.2 + -- cgit v1.2.3-70-g09d2