freebsd: set BOOTSTRAPPING when building for Linux
#337351
Open
Conversation
This file contains 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
FreeBSD loves to access system headers for platform-specific builtins. This is fine on FreeBSD but often breaks when building utilities for Linux. `BOOTSTRAPPING` disables using most of these headers. Instead of adding workarounds to every package, just set `BOOTSTRAPPING` when the host platform is not FreeBSD.
dotlambda
reviewed
Aug 25, 2024
| @@ -89,6 +89,7 @@ lib.makeOverridable ( | |||
| # Since STRIP in `makeFlags` has to be a flag, not the binary itself | |||
| STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip"; | |||
| } | |||
| // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = true; } | |||
There was a problem hiding this comment.
Suggested change
| // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = true; } | |
| // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { env.BOOTSTRAPPING = true; } |
There was a problem hiding this comment.
That would override packages that set env themselves. If we're going to switch to env then everything should switch to it.
There was a problem hiding this comment.
That would override packages that set env themselves.
Easy fix: env = attrs.env // { BOOTSTRAPPING = true; }.
If we're going to switch to env then everything should switch to it.
True but that's not a reason to introduce more uses of a deprecated feature.
There was a problem hiding this comment.
I pushed an additional commit which moves all the environment variables in this file to env.
rhelmot
force-pushed
the
freebsd-bootstrapping
branch
from
2256bae
to
80af534
Compare
rhelmot
force-pushed
the
freebsd-bootstrapping
branch
from
80af534
to
d7ca431
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
FreeBSD loves to access system headers for platform-specific builtins. This is fine on FreeBSD but often breaks when building utilities for Linux.
BOOTSTRAPPINGdisables using most of these headers.Fixes #335730
Description of changes
Set
BOOTSTRAPPINGon all FreeBSD packages when thehostPlatformis not FreeBSD.Also remove no-longer-needed
BOOTSTRAPPINGdefinitions. Due to strange FreeBSD bmake behavior, these always made the build happen in bootstrap mode, even when they were set to false.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.