diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
commit | 097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch) | |
tree | daa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch | |
parent | 950827890cca5caf633480047da6115f43b1a529 (diff) | |
parent | 18b490b7953735328501c6f7e54522a91220caf3 (diff) | |
download | packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2 packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1
See merge request !105
Diffstat (limited to 'user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch')
-rw-r--r-- | user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch new file mode 100644 index 000000000..d50e15933 --- /dev/null +++ b/user/rust/0022-Link-stage-2-tools-dynamically-to-libstd.patch @@ -0,0 +1,27 @@ +From da4ae76c0e8986711f235ceb676cd61db9bf3c7a Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 24 Sep 2018 23:42:23 +0000 +Subject: [PATCH 22/24] 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 e5299761a1..2e364d3cd1 100644 +--- a/src/bootstrap/tool.rs ++++ b/src/bootstrap/tool.rs +@@ -215,7 +215,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.18.0 + |