llvmPackages_git.libcxx: LLVM15 changes and libcxxrt on FreeBSD#223255
Merged
RaitoBezarius merged 4 commits intomasterfrom Apr 19, 2023
Merged
llvmPackages_git.libcxx: LLVM15 changes and libcxxrt on FreeBSD#223255RaitoBezarius merged 4 commits intomasterfrom
RaitoBezarius merged 4 commits intomasterfrom
Conversation
2fd4094 to
7702f9f
Compare
48 tasks
Port of bc4dbee ("llvmPackages_15: updates for LLVM 15"). None of the patches required any touch-up; the only change of note is: - due to changes in the libc++/libc++abi build (https://reviews.llvm.org/D120719 and https://reviews.llvm.org/D131037) we have to add an extra build option to the libc++ header only build that sidesteps bits of the libc++ build config that assume libc++-abi is present in the build: https://github.com/llvm/llvm-project/blob/4f827318e3e8ccab4ff131e06234caa827e91e4e/libcxx/src/CMakeLists.txt#L255-L256 Rather than maintaining a precise set of build options that let us dodge referencing libc++-abi variables in the libc++ header only build, we set `LIBCXX_CXX_ABI` to `none`, as suggested by @lovesegfault. More discussion about this here: #194634 (comment) Co-authored-by: Bernardo Meurer <bernardo@meurer.org>
…e LLVM stdenv Port of 8db72e3 ("llvmPackages_15.libcxxabi: fix cycles that arise when `stdenv` is the LLVM stdenv").
Port of 4fabcf4 ("llvmPackages_15: apply #211230 to llvmPackages_15"). See the comments here for context: #194634 (comment) Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
This has not been added for `llvmPackages_15.libcxx`, therefore, we do not need it anymore.
7702f9f to
92bf933
Compare
Member
Author
|
@ofborg build llvmPackages_git.libcxx |
rrbutani
approved these changes
Apr 5, 2023
Contributor
rrbutani
left a comment
There was a problem hiding this comment.
Looks good!
The preInstall on libcxx indeed isn't needed anymore; IIRC switching to using the the clang built alongside libcxx removed the need to patch out the "other" libcxxabi dylib.
Member
Author
|
@ofborg build llvmPackages_git.libcxx |
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.
Description of changes
Backport from LLVM15.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)