-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
llvmPackages_13.compiler-rt-libc: fix python3 setuptools dependency #327038
llvmPackages_13.compiler-rt-libc: fix python3 setuptools dependency #327038
Conversation
Uh oh, infinite recursion... |
+ lib.optionalString (lib.versionOlder release_version "15") ''
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py dropped in v15
substituteInPlace libcxx/utils/merge_archives.py \
--replace-fail 'import distutils.spawn' 'from shutil import which as find_executable' \
--replace-fail distutils.spawn. ""
'' + Original source: https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py
|
84c41e7
to
dc57cdd
Compare
dc57cdd
to
bda34eb
Compare
Got the PR down to just the fix for 13. 12 and 14 are all right. Merging in #327037 to test:
|
4ce47c4
to
502b500
Compare
Updated comment with:
|
502b500
to
4c1d982
Compare
@RossComputerGuy, hi, this PR is blocking almost any upgrade of |
My review is the same as @SuperSandro2000's. @numinit just needs to add the change and this will be gtg. |
Thanks, I'll get to the change tonight. Busy week 😅 |
4c1d982
to
f486fe9
Compare
Done. |
This function was removed in Python 3.12 and seems to only be used in LLVM 13, despite the Python file this is used in being present in LLVM 12 and 14. The merge_archives.py file was removed in LLVM 15.
f486fe9
to
37ba897
Compare
@numinit @RossComputerGuy what else is required to have it merged into master and thenunstable? Maybe I can ask around in some chats to help move this patch? |
Good question. As far as I know, it works and fixes KLEE, at least. |
Description of changes
Fixing LLVM 13 breakage due to setuptools removal in #320924.
Partially resolves #326927
Build of
llvmPackages_13.compiler-rt-libc
fails at the tail end with:Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.