From 662ca3f88621d231be1edb695319efaa6d262572 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 24 Sep 2018 23:42:23 +0000 Subject: [PATCH 16/18] 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 c91ccc79aa1..e1b90400cc0 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -236,7 +236,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