Revert "perf: inherit makeFlags from kernel"#429818
Merged
alyssais merged 1 commit intoNixOS:stagingfrom Aug 4, 2025
Merged
Conversation
This reverts commit 94276da. Original justification[1] was: > it reduces unnecessary code duplication and should help with cross > compilation (although this cannot be tested yet because some > dependencies fail). However, as time as gone on its become increasingly clear that the kernels make flags are going to be specific to building a kernel, not a userspace program, hence them having been renamed to kernelModuleMakeFlags in the meantime. This has become even more apparent now that we're using unwrapped compilers for the kernel, which doesn't go at all well with building a userspace program like perf, so we stop inheriting any make flags from the kernel, and instead just set the two flags necessary for cross compilation to work. Link: NixOS#34068 [1] Fixes: e9b2edb ("linux: un-simplify toolchain selection")
13 tasks
nixpkgs-ci
bot
added
10.rebuild-linux: 11-100
tobim
approved these changes
Jul 31, 2025
nixpkgs-ci
bot
added
12.approvals: 1
14 tasks
lopsided98
added a commit
to lopsided98/nixpkgs
that referenced
this pull request
Aug 27, 2025
tmon broke with the addition of unwrapped compilers to kernelModuleMakeFlags. Apply the same fix as with perf (see NixOS#429818) and manually pass ARCH and CROSS_COMPILE. Fixes: e9b2edb ("linux: un-simplify toolchain selection")
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This reverts commit 94276da.
Original justification was:
However, as time as gone on its become increasingly clear that the kernels make flags are going to be specific to building a kernel, not a userspace program, hence them having been renamed to kernelModuleMakeFlags in the meantime. This has become even more apparent now that we're using unwrapped compilers for the kernel, which doesn't go at all well with building a userspace program like perf, so we stop inheriting any make flags from the kernel, and instead just set the two flags necessary for cross compilation to work.
Fixes: e9b2edb ("linux: un-simplify toolchain selection")
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.