diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-05-15 08:10:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 08:10:44 +0200 |
| commit | a37ba96868d67b0631e7e50b75993eba4dadcdf3 (patch) | |
| tree | 23d00ede7c4892ad5399145d5d2cb3f4083c8842 /compiler/rustc_codegen_llvm/src | |
| parent | 673d45124ba5369ffc0a1e9ccea0d299289e9981 (diff) | |
| parent | f38555c3b3a39b75e9016897f405c795c5afdf18 (diff) | |
| download | rust-a37ba96868d67b0631e7e50b75993eba4dadcdf3.tar.gz rust-a37ba96868d67b0631e7e50b75993eba4dadcdf3.zip | |
Rollup merge of #97041 - eddyb:nixos-llvm-ci-patchelf, r=Mark-Simulacrum
Fix `download-ci-llvm` NixOS patching for `.so`s. See https://github.com/rust-lang/rust/pull/95170#discussion_r872960686 - in short, `Path::ends_with` doesn't do the same thing as `str::ends_with`, and can only be used to check for whole file names, not extensions. With this PR, I get the full suite of: ``` extracting /home/eddy/Projects/rust-A/build/cache/llvm-ebb80ec4e90f8622440f3e33562db0d6e6c66555-true/rust-dev-nightly-x86_64-unknown-linux-gnu.tar.xz to /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/bin/llvm-config /nix/store/r4bzq2xilvv8fmqjg626hzwi22ah3hf4-rust-stage0-dependencies info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck info: you seem to be using Nix. Attempting to patch /home/eddy/Projects/rust-A/build/x86_64-unknown-linux-gnu/ci-llvm/lib/libLLVM-14-rust-1.62.0-nightly.so ``` (that `libLLVM-14-rust-1.62.0-nightly.so` at the end having been missing before) r? `@Mark-Simulacrum` cc `@jyn514`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions