Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: fix risc-v build failure #268755

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Nov 20, 2023

Description of changes

Alternative to #268067 while we wait for #268097

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • riscv64-linux
  • 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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@fgaz fgaz changed the title cmake: fix risc-v build due to missing atomic ops cmake: fix risc-v build failure Nov 20, 2023
riscv64 is failing due to missing atomic ops in gcc 12.
This commit works around the problem by linking against libatomic.

It can be reverted when we switch to gcc 13 (NixOS#268097)
@AndersonTorres AndersonTorres merged commit 3832b75 into NixOS:master Nov 22, 2023
23 checks passed
@fgaz fgaz deleted the cmake/fix-riscv branch November 22, 2023 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants