Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
pistache
Commits
6b217cc0
Unverified
Commit
6b217cc0
authored
Aug 10, 2021
by
Kip
Committed by
GitHub
Aug 10, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #968 from jurij-robba/master
also check for linking with libatomic
parents
05c6bcdd
42cdc4f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
meson.build
meson.build
+4
-4
No files found.
meson.build
View file @
6b217cc0
...
...
@@ -49,11 +49,11 @@ int main() {
return ++x;
}
'''
has_working_cxx_atomics = compiler.
compile
s(cxx_atomics_check_code, name: 'std::atomic')
has_working_cxx_atomics = compiler.
link
s(cxx_atomics_check_code, name: 'std::atomic')
if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics
libatomic_dep = compiler.find_library('atomic')
assert(compiler.has_function('__atomic_fetch_add_4', dependencies: libatomic_dep), 'Host compiler appears to require libatomic, but cannot find it.')
has_working_cxx_atomics = compiler.
compile
s(cxx_atomics_check_code, dependencies: libatomic_dep, name: 'std::atomic with libatomic')
has_working_cxx_atomics = compiler.
link
s(cxx_atomics_check_code, dependencies: libatomic_dep, name: 'std::atomic with libatomic')
assert(has_working_cxx_atomics, 'Host compiler must support std::atomic')
deps_libpistache += libatomic_dep
endif
...
...
@@ -68,11 +68,11 @@ int main() {
return 0;
}
'''
has_working_cxx_atomics64 = compiler.
compile
s(cxx_atomics64_check_code, name: 'std::atomic<uint64_t>')
has_working_cxx_atomics64 = compiler.
link
s(cxx_atomics64_check_code, name: 'std::atomic<uint64_t>')
if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics64
libatomic_dep = compiler.find_library('atomic')
assert(compiler.has_function('__atomic_load_8', dependencies: libatomic_dep), 'Host compiler appears to require libatomic for 64-bit operations, but cannot find it.')
has_working_cxx_atomics = compiler.
compile
s(cxx_atomics64_check_code, dependencies: libatomic_dep, name: 'std::atomic<uint64_t> with libatomic')
has_working_cxx_atomics = compiler.
link
s(cxx_atomics64_check_code, dependencies: libatomic_dep, name: 'std::atomic<uint64_t> with libatomic')
assert(has_working_cxx_atomics, 'Host compiler must support 64-bit std::atomic')
deps_libpistache += libatomic_dep
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment