Skip to content

bintools: fix wrapper build on FreeBSD native#311762

Closed
rhelmot wants to merge 1 commit intoNixOS:masterfrom
rhelmot:freebsd-minimal3/bintools
Closed

bintools: fix wrapper build on FreeBSD native#311762
rhelmot wants to merge 1 commit intoNixOS:masterfrom
rhelmot:freebsd-minimal3/bintools

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented May 14, 2024

Also port a similar fix to cc wrapper

part of #296581

This one is... complicated. The dynamic loader path should be self explanatory, but the output filtering in meta was the only thing I could figure out how to do to assuage a recursion error in stdenv/freebsd (linked). If someone else knows what exactly I'm messing with here, please feel free to issue a better fix and I'll try it out.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd
  • 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.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

@rhelmot rhelmot requested a review from Ericson2314 as a code owner May 14, 2024 22:42
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 14, 2024
@rhelmot rhelmot added the 6.topic: bsd Running or building packages on BSD label May 15, 2024
@alyssais alyssais requested review from alyssais and removed request for alyssais May 15, 2024 08:08
@rhelmot rhelmot force-pushed the freebsd-minimal3/bintools branch from 0d33471 to d61479d Compare May 20, 2024 14:24
@rhelmot
Copy link
Contributor Author

rhelmot commented May 20, 2024

I did some tests and determined that the outputsToInstall diff was actually unnecessary for building stdenv or the bootstrap files so I removed it. If it becomes necessary later we can add it then :)

Copy link
Member

Choose a reason for hiding this comment

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

Is this one still necessary? It's not explained in the commit message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is not necessary but I found it helpful in debugging different issues so I left it for future hackers. I will document it.

@rhelmot rhelmot force-pushed the freebsd-minimal3/bintools branch from d61479d to f51b886 Compare May 20, 2024 14:41
@Ericson2314
Copy link
Member

This could go to master!

@rhelmot rhelmot changed the base branch from staging to master May 20, 2024 15:50
@rhelmot rhelmot force-pushed the freebsd-minimal3/bintools branch from f51b886 to 9f76d13 Compare May 20, 2024 15:50
@NixOS NixOS locked as spam and limited conversation to collaborators May 20, 2024
@alyssais
Copy link
Member

Please make sure to follow the procedure for switching branches, or GitHub will automatically subscribe a bunch of people, who then can't be unsubscribed. (Removing the request for review does not do this.)

@alyssais
Copy link
Member

Please resubmit.

@alyssais alyssais closed this May 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

6.topic: bsd Running or building packages on BSD 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 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.

3 participants