llvmPackages_git: remove #269994
Closed
llvmPackages_git: remove #269994
Conversation
This file contains 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
Artturin
commented
Nov 25, 2023
Comment on lines
-83
to
-101
| preInstall = lib.optionalString stdenv.isDarwin '' | ||
| for file in lib/*.dylib; do | ||
| if [ -L "$file" ]; then continue; fi | ||
|
|
||
| # Fix up the install name. Preserve the basename, just replace the path. | ||
| installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" | ||
|
|
||
| # this should be done in CMake, but having trouble figuring out | ||
| # the magic combination of necessary CMake variables | ||
| # if you fancy a try, take a look at | ||
| # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling | ||
| ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file | ||
|
|
||
| # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes | ||
| # libcxxabi to sometimes link against a different version of itself. | ||
| # Here we simply make that second reference point to ourselves. | ||
| for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do | ||
| ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file | ||
| done |
There was a problem hiding this comment.
This change is missing from 15 but in #194634
#185766
verify still needed; add a regression passthru test?
appears to be no longer needed; libc++abi.so didn't seem to be linked against older libc++abi on non-darwin anyways (where the default stdenv wasn't LLVM based) and now we unconditionally use the clang from the same package set which has libcxx set to null and thus doesn't try to link in any libc++abi
Artturin
commented
Nov 25, 2023
| , ninja | ||
| , python3 | ||
| , libffi | ||
| , enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) |
There was a problem hiding this comment.
This is enableGoldPlugin ? libbfd.hasPluginAPI in 15 because b9a9dfc wasn't ported to git
|
I went through all the diffs and there are no changes missing for 15, only changes missing from _git |
Artturin
force-pushed
the
llvmremovegit
branch
from
228a2fa
to
d29bf06
Compare
Works after changing `git/default.nix` to use `gitRelease` instead of `officialRelease`
Wont update the version attr
```
, gitRelease ? {
version = "15.0.0";
rev = "a5640968f2f7485b2aa4919f5fa68fd8f23e2d1f";
rev-version = "unstable-2022-26-07";
sha256 = "1sh5xihdfdn2hp7ds3lkaq1bfrl4alj36gl1aidmhlw65p5rdvl7";
}
```
There are no maintainers for this as shown by it still being at llvm 15 and it's unnecessary work to apply all changes to it. It has not been a git version for a long time and often lags behind the latest stable llvm
Artturin
force-pushed
the
llvmremovegit
branch
from
d29bf06
to
b84c55e
Compare
|
|
Artturin
requested review from
flokli,
Ericson2314,
AndersonTorres,
dotlambda and
primeos
AndersonTorres
approved these changes
Nov 26, 2023
ofborg
bot
added
10.rebuild-darwin: 0
wegank
added
the
12.approvals: 1
wegank
added
the
2.status: merge conflict
|
Probably shouldn't kill |
rrbutani
added
the
6.topic: llvm/clang
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There are no maintainers for this as shown by it still being at llvm 15 and it's unnecessary work to apply all changes to it.
It has not been a git version for a long time and often lags behind the latest stable llvm
Here are all the differences between the current base(15) of _git and 15 https://gist.github.com/Artturin/c39265ecaeea523cd7224fc7b7632371
We should do this because it eases (my) work on deduplicating llvmPackages, after more of it is deduplicated then we could reconsider adding this back but for now it's just a burden.
Any user who wants to use a git release can use the
gitReleaseargument in 13+Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Priorities
Add a 👍 reaction to pull requests you find important.