]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Auto merge of #84071 - nagisa:nixos-patching-fix, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Sun, 11 Apr 2021 02:59:30 +0000 (02:59 +0000)
committerbors <bors@rust-lang.org>
Sun, 11 Apr 2021 02:59:30 +0000 (02:59 +0000)
commitea1252e7e3282fa8a3163ca424d6ed00a9dbe163
tree37e125e303b85bd149cf20cc419cf600337edc6b
parentef38b45e8b5fe9258173376565e718b071c96cd7
parent3dabab1c1e642e0da9242fdda90e58ea447eba01
Auto merge of #84071 - nagisa:nixos-patching-fix, r=Mark-Simulacrum

Fix NixOS patching

Moving the `.nix-deps` has resulted in rpath links being broken and
therefore bootstrap on NixOS broken entirely.

This PR still produces a `.nix-deps` but only for the purposes of
producing a gc root. We rpath a symlink-resolved result instead.

For purposes of simplicity we also use joinSymlink to produce a single
merged output directory so that we don't need to update multiple
locations every time we add a library or something.

Fixes a regression from https://github.com/rust-lang/rust/pull/82739.