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.

Sign up for GitHub

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

Jump to bottom

lib.systems: introduce toolchain, cc, and bintools attributes #365057

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lib.systems: introduce toolchain, cc, and bintools attributes #365057

wants to merge 1 commit into from
+203 −107

Conversation

RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Dec 13, 2024 •
edited
Loading

Things done

Replaces useLLVM, useArocc, and useZig with toolchain, cc, linker, and bintools attributes. This might not produce any rebuilds but we'll see. This has the advantage of preventing using${compiler} flags from colliding and not working correctly if we were to stack multiple pkgs* together.

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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: python 6.topic: rust 6.topic: windows Running, or buiding, packages on Windows 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Dec 13, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/toolchain-attrs branch 3 times, most recently from 7a3eca0 to 2a005fa Compare December 14, 2024 00:20
@RossComputerGuy RossComputerGuy force-pushed the feat/toolchain-attrs branch 2 times, most recently from 9c8b44b to f6da63d Compare December 14, 2024 00:41
@tomberek
Copy link
Contributor

The main idea and motivation is in: pkgs/stdenv/cross/default.nix

@RossComputerGuy RossComputerGuy force-pushed the feat/toolchain-attrs branch 2 times, most recently from 10cd2ba to 2b4d320 Compare December 14, 2024 01:33
@RossComputerGuy RossComputerGuy marked this pull request as ready for review December 14, 2024 01:47
reckenrode
reckenrode reviewed Jan 21, 2025
View reviewed changes
lib/systems/default.nix Outdated
@@ -112,15 +131,24 @@ let
else if final.isNone then "newlib"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";

unwinderlib =
/**/ if final.useLLVM || final.useArocc || final.useZig || final.isDarwin then "libunwind"
Copy link
Contributor

@reckenrode reckenrode Jan 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Should Darwin be a distinct value? It uses the system unwinder, which is based on libunwind, but it’s part of libSystem and linked automatically. If so, I’d make it something like libunwind-system. That should also simplify the checks in LLVM for whether to link libunwind.

reckenrode
reckenrode reviewed Jan 21, 2025
View reviewed changes
lib/systems/default.nix Outdated Show resolved Hide resolved
reckenrode
reckenrode reviewed Jan 21, 2025
View reviewed changes
pkgs/build-support/cc-wrapper/default.nix
@@ -120,8 +120,8 @@ let

useGccForLibs = useCcForLibs
&& libcxx == null
&& targetPlatform.rtlib == "libgcc"
&& !targetPlatform.isDarwin
Copy link
Contributor

Choose a reason for hiding this comment

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

Can the Darwin check be dropped since targetPlatform.rtlib will be compiler-rt on Darwin.

Copy link
Member Author

Choose a reason for hiding this comment

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

What about when people change the value?

Copy link
Contributor

Choose a reason for hiding this comment

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

If someone changes it to libgcc on Darwin?

@RossComputerGuy RossComputerGuy force-pushed the feat/toolchain-attrs branch 4 times, most recently from bed4343 to 22a0ffb Compare January 21, 2025 15:30
@RossComputerGuy
Copy link
Member Author

I fixed the rust stuff a bit more so it's based on build and target not quite aligning which should match the cases for the LLVM hack. I've also got the bintools evaling to the same value before the changes so the rebuild counts for Darwin and Linux should be little.

@RossComputerGuy RossComputerGuy force-pushed the feat/toolchain-attrs branch 2 times, most recently from eeed51a to 37e3b75 Compare January 22, 2025 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy requested changes

@reckenrode reckenrode reckenrode left review comments

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@philiptaron philiptaron philiptaron approved these changes

@aanderse aanderse Awaiting requested review from aanderse

@alyssais alyssais Awaiting requested review from alyssais

@arianvp arianvp Awaiting requested review from arianvp

@Artturin Artturin Awaiting requested review from Artturin

@dtzWill dtzWill Awaiting requested review from dtzWill

@ElvishJerricco ElvishJerricco Awaiting requested review from ElvishJerricco

@figsoda figsoda Awaiting requested review from figsoda

@flokli flokli Awaiting requested review from flokli

@lovek323 lovek323 Awaiting requested review from lovek323

@Mic92 Mic92 Awaiting requested review from Mic92

@rrbutani rrbutani Awaiting requested review from rrbutani

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@winterqt winterqt Awaiting requested review from winterqt

@zowoq zowoq Awaiting requested review from zowoq

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@ethindp ethindp Awaiting requested review from ethindp

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@vcunat vcunat Awaiting requested review from vcunat

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: python 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: windows Running, or buiding, packages on Windows 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@RossComputerGuy @tomberek @pwaller @reckenrode @nixos-discourse @sternenseemann @emilazy @philiptaron @Ericson2314 @wegank