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.stdenv: make Darwin a “system” libc++ platform #347388

Draft
wants to merge 5 commits into
base: staging
Choose a base branch
from

Conversation

reckenrode
Copy link
Contributor

This was split off from #346043. It updates overrideLibcxx to use tapi to restrict symbols and updates LLVM to always apply the adapter on Darwin. This aligns Darwin’s behavior regarding LLVM with Linux, which always uses libstdc++ unless you use llvmPackages.libcxxStdenv.

Whether to apply this to pkgsLLVM is an open question. It makes sense to do that there as well.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: stdenv Standard environment 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Oct 9, 2024
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 9, 2024
@github-actions github-actions bot removed the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Oct 11, 2024
@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Oct 11, 2024
Applying `overrideLibcxx` by default allows various LLVM versions to use
the same underlying libc++ on Darwin. This works because libc++ is built
by default with the stable ABI. Using the same libc++ regardless of LLVM
version avoids potential ODR violations from linking multiple libc++
versions in the same process.

This is similar to the default on Linux, which uses libstdc++ instead of
libc++. On both platforms, to force a stdenv to link against that LLVM
version’s libc++, use `libcxxStdenv`.
Take advantage of the fact that an overriden libc++ has the “system”
version prepended to the new version, so it doesn’t get overriden again.
Darwin’s linkers support text-based stubs, which allows the override to
use the “system” libc++ while limiting the symbols to those in the
original version.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: stdenv Standard environment 10.rebuild-darwin: 101-500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant