1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From: Sebastian Ramacher <sramacher@debian.org>
Date: Mon, 18 Apr 2022 22:33:16 +0200
Subject: Fix build if linking to libatomic is required
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index ce7956b..e0f378f 100644
--- a/meson.build
+++ b/meson.build
@@ -486,6 +486,10 @@ else # system not darwin or windows
]
endif # system
+general_include_dirs += get_option('extra_include_dirs')
+general_compile_args = [ arch_flags, feature_defines ]
+general_dependencies = [ feature_dependencies, thread_dep ]
+
test_atomic = '''
#include <atomic>
int main(void)
@@ -506,10 +510,6 @@ if not cxx.links(test_atomic, name: 'std::atomic<int64_t> without libatomic')
endif
endif
-general_include_dirs += get_option('extra_include_dirs')
-general_compile_args = [ arch_flags, feature_defines ]
-general_dependencies = [ feature_dependencies, thread_dep ]
-
rubberband_additional_static_lib = ''
if cpp.get_id() == 'msvc'
|
