Skip to content

cc-wrapper: tidy logic for implied hardening flags#414842

Merged
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-add-hardening-tidy-implied
Jun 9, 2025
Merged

cc-wrapper: tidy logic for implied hardening flags#414842
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-add-hardening-tidy-implied

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Jun 7, 2025

I'm not sure my brain was fully working when I wrote this bit of #400408. What's committed works fine, but it makes a lot more sense to combine the "Remove unsupported flags" loops.

Tested tests.hardeningFlags on indicated platforms successfully.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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.

this can be done more neatly than my previous just-copy-the-blocks
approach
@risicle risicle requested review from a team and philiptaron June 7, 2025 20:50
@nix-owners nix-owners bot requested a review from Ericson2314 June 7, 2025 20:52
@github-actions github-actions bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 7, 2025
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

I'm not sure my brain was fully working when I wrote this bit.

I often say the same of my own works. LGTM; I'll run the hardening tests, then merge.

@risicle risicle merged commit 9294eaa into NixOS:staging Jun 9, 2025
16 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants