Skip to content
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_git.libcxx: LLVM15 changes and libcxxrt on FreeBSD #223255

Merged
merged 4 commits into from
Apr 19, 2023

Conversation

RaitoBezarius
Copy link
Member

@RaitoBezarius RaitoBezarius commented Mar 26, 2023

Description of changes

Backport from LLVM15.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@RaitoBezarius RaitoBezarius force-pushed the llvmPackages_git.libcxx-tests branch 3 times, most recently from 2fd4094 to 7702f9f Compare March 26, 2023 15:21
@RaitoBezarius RaitoBezarius changed the base branch from staging to master April 4, 2023 11:40
rrbutani and others added 4 commits April 5, 2023 17:25
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.
@RaitoBezarius RaitoBezarius marked this pull request as ready for review April 5, 2023 15:27
@RaitoBezarius
Copy link
Member Author

@ofborg build llvmPackages_git.libcxx

Copy link
Contributor

@rrbutani rrbutani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@RaitoBezarius
Copy link
Member Author

@ofborg build llvmPackages_git.libcxx

@RaitoBezarius RaitoBezarius merged commit 89e4896 into master Apr 19, 2023
@RaitoBezarius RaitoBezarius deleted the llvmPackages_git.libcxx-tests branch May 8, 2023 20:00
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants