compiler-rt: Revert passing COMPILER_RT_OS_DIR and not symlinking libs#122399
Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom May 9, 2021
Merged
Conversation
In 7869d16 I got rid of the symlinking by forcing `COMPILER_RT_OS_DIR` to always be the empty string. I thought this was good because it just make compiler-rt be installed in a normal way. However, various LLVM tools expect the `COMPILER_RT_OS_DIR` to be set normally, and fail to find things when they aren't in the expected lib subdir. Maybe it would be best to patch that too in the long term, but for now we just undo this change.
Member
Author
|
I kicked off a build locally to make sure this indeed fixes |
sternenseemann
approved these changes
May 9, 2021
Member
Author
nix-build -E '(import ./. { crossSystem = { config = "x86_64-unknown-linux-musl"; useLLVM = true; }; }).stdenv'worked just fine! |
10 tasks
12 tasks
vcunat
pushed a commit
that referenced
this pull request
May 12, 2021
compiler-rt: Revert passing `COMPILER_RT_OS_DIR` and not symlinking libs (cherry picked from commit 680b33f) #111487 (comment)
21 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
In 7869d16 I got rid of the symlinking
by forcing
COMPILER_RT_OS_DIRto always be the empty string. I thoughtthis was good because it just make compiler-rt be installed in a normal
way.
However, various LLVM tools expect the
COMPILER_RT_OS_DIRto be setnormally, and fail to find things when they aren't in the expected lib
subdir.
Maybe it would be best to patch that too in the long term, but for now
we just undo this change.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)