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/0021-Link-stage-2-tools-dynamically-to-libstd.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/0021-Link-stage-2-tools-dynamically-to-libstd.patch')
-rw-r--r-- | user/rust/0021-Link-stage-2-tools-dynamically-to-libstd.patch | 27 |
1 files changed, 27 insertions, 0 deletions
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 <samuel@sholland.org> +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 + |