diff options
| author | bors <bors@rust-lang.org> | 2021-04-11 02:59:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-11 02:59:30 +0000 |
| commit | ea1252e7e3282fa8a3163ca424d6ed00a9dbe163 (patch) | |
| tree | 37e125e303b85bd149cf20cc419cf600337edc6b /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | ef38b45e8b5fe9258173376565e718b071c96cd7 (diff) | |
| parent | 3dabab1c1e642e0da9242fdda90e58ea447eba01 (diff) | |
| download | rust-ea1252e7e3282fa8a3163ca424d6ed00a9dbe163.tar.gz rust-ea1252e7e3282fa8a3163ca424d6ed00a9dbe163.zip | |
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.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
0 files changed, 0 insertions, 0 deletions