about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-03 23:42:23 +0000
committerbors <bors@rust-lang.org>2019-04-03 23:42:23 +0000
commit314a79cd80ed905f80d24b79fd7acb4c8c72789b (patch)
tree8ce3ec42845d68af8702042b8425dfe2d7709808 /src
parentf8673e0ad85e98997faa76fa7edc99c5825f46ee (diff)
parent5b292ecdb1ca33a81f80ac2ff8f2b9866498cb46 (diff)
downloadrust-314a79cd80ed905f80d24b79fd7acb4c8c72789b.tar.gz
rust-314a79cd80ed905f80d24b79fd7acb4c8c72789b.zip
Auto merge of #59672 - o01eg:fix-59661, r=oli-obk
Revert rust-lld place changes

Fixes #59661.

Instead of https://github.com/rust-lang/rust/pull/59668 it reverts only failed part.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index a4d924d64ee..a923f2d2ca3 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -518,8 +518,7 @@ impl Step for Rustc {
                     .join("bin")
                     .join(&exe);
                 // for the rationale about this rename check `compile::copy_lld_to_sysroot`
-                let dst = image.join(libdir_relative)
-                    .join("rustlib")
+                let dst = image.join("lib/rustlib")
                     .join(&*host)
                     .join("bin")
                     .join(&exe);