max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 10:46:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11540 from NixOS/meson-arm-atomic

Browse source 
nix-util / meson: Add -latomic on arm
This commit is contained in:
Eelco Dolstra 2024-09-19 16:09:14 +02:00 committed by GitHub
commit 9ea29ea517
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/meson.build
View file

@ -51,6 +51,14 @@ endforeach
subdir('build-utils-meson/threads') subdir('build-utils-meson/threads')
# Check if -latomic is needed
# This is needed for std::atomic on some platforms
# We did not manage to test this reliably on all platforms, so we hardcode
# it for now.
if host_machine.cpu_family() == 'arm'
deps_other += cxx.find_library('atomic')
endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32') socket = cxx.find_library('ws2_32')
deps_other += socket deps_other += socket