From 7ff61b754950fa82d16e1bcbb458c54a38598f2a Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 5 Jul 2019 23:26:12 -0500 Subject: user/rust: Bump to 1.36.0 Signed-off-by: Samuel Holland --- ...-Link-stage-2-tools-dynamically-to-libstd.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch (limited to 'user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch') diff --git a/user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch deleted file mode 100644 index e46aeac77..000000000 --- a/user/rust/0011-Link-stage-2-tools-dynamically-to-libstd.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 91549d8c4f37fd0756d2b95fffcb7055acb663d1 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Mon, 24 Sep 2018 23:42:23 +0000 -Subject: [PATCH 11/13] 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 23775a91e4..d79fede548 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 - -- cgit v1.2.3-70-g09d2