Skip to content

apparmor: Remove flags not recognized by clang#195972

Closed
peperunas wants to merge 1 commit intoNixOS:stagingfrom
peperunas:apparmor-i686
Closed

apparmor: Remove flags not recognized by clang#195972
peperunas wants to merge 1 commit intoNixOS:stagingfrom
peperunas:apparmor-i686

Conversation

@peperunas
Copy link
Copy Markdown
Contributor

Description of changes

This issue is part of a series of bugfixes to improve the i686 cross-compilation pipeline.

Tracking issue: #195967

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from joachifm, ju1m and thoughtpolice October 14, 2022 13:40
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 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 Oct 14, 2022
@lovesegfault
Copy link
Copy Markdown
Member

This has to target staging due to the mass rebuilds.

@peperunas peperunas changed the base branch from master to staging October 15, 2022 15:35
'';

# -flto-partition=none is not recognized by Clang
preConfigure = if (stdenv.cc.isClang or false) then ''
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this can just use lib.optionalString. also, is the or false rellay necessary?

@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 19, 2024
'';

# -flto-partition=none is not recognized by Clang
preConfigure = if (stdenv.cc.isClang or false) then ''
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
preConfigure = if (stdenv.cc.isClang or false) then ''
preConfigure = lib.optionalString stdenv.cc.isClang ''

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 17, 2025
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label May 17, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 25, 2025
@SuperSandro2000
Copy link
Copy Markdown
Member

Closing as stale since the author did not react to feedback in years.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 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.

6 participants