diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-07-05 23:26:12 -0500 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-09-05 02:05:29 +0000 |
| commit | 7ff61b754950fa82d16e1bcbb458c54a38598f2a (patch) | |
| tree | 15c91da7a3615df6c9dc7dad00b50ba4ddb813d7 /user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch | |
| parent | 1c147dccb8b8b31fbc830e963f301e99ebc25d8d (diff) | |
| download | packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.gz packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.bz2 packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.tar.xz packages-7ff61b754950fa82d16e1bcbb458c54a38598f2a.zip | |
user/rust: Bump to 1.36.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch')
| -rw-r--r-- | user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch new file mode 100644 index 000000000..ab31ba75f --- /dev/null +++ b/user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch @@ -0,0 +1,27 @@ +From cef4e3d7019c07115f1a4ee66987a4e0ecf8505f Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 24 Sep 2018 23:42:23 +0000 +Subject: [PATCH 10/12] 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 edcd68d010e..b5acf43bba7 100644 +--- a/src/bootstrap/tool.rs ++++ b/src/bootstrap/tool.rs +@@ -209,7 +209,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 + |