From 56b8911766bd617b7560939243ba6410f4fe6df7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 19 Sep 2024 00:00:17 +0200
Subject: [PATCH] nix-util / meson: Add -latomic on arm

I couldn't get the test program to work correctly after many attempts,
so let's just unblock this without making it perfect.
---
 src/libutil/meson.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 797dcae6d..482997096 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -50,6 +50,14 @@ endforeach
 
 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'
   socket = cxx.find_library('ws2_32')
   deps_other += socket