Unverified Commit 2d3ed2a6 authored by Kip's avatar Kip Committed by GitHub

Merge pull request #1008 from pistacheio/kip-fix-riscv64

meson.build: Fix broken check for atomic support. This broke on riscv64…
parents ff9db0d9 c22cbbb8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
project( project(
'pistache', 'pistache',
'cpp', 'cpp',
version: '0.0.002', version: '0.0.003', # TODO: This should be assigned dynamically from version.txt
license: 'Apache-2.0', license: 'Apache-2.0',
default_options: [ default_options: [
'cpp_std=c++17', 'cpp_std=c++17',
...@@ -59,7 +59,6 @@ int main() { ...@@ -59,7 +59,6 @@ int main() {
has_working_cxx_atomics = compiler.links(cxx_atomics_check_code, name: 'std::atomic') has_working_cxx_atomics = compiler.links(cxx_atomics_check_code, name: 'std::atomic')
if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics
libatomic_dep = compiler.find_library('atomic') 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.links(cxx_atomics_check_code, dependencies: libatomic_dep, name: 'std::atomic with libatomic') has_working_cxx_atomics = compiler.links(cxx_atomics_check_code, dependencies: libatomic_dep, name: 'std::atomic with libatomic')
assert(has_working_cxx_atomics, 'Host compiler must support std::atomic') assert(has_working_cxx_atomics, 'Host compiler must support std::atomic')
deps_libpistache += libatomic_dep deps_libpistache += libatomic_dep
...@@ -78,7 +77,6 @@ int main() { ...@@ -78,7 +77,6 @@ int main() {
has_working_cxx_atomics64 = compiler.links(cxx_atomics64_check_code, name: 'std::atomic<uint64_t>') has_working_cxx_atomics64 = compiler.links(cxx_atomics64_check_code, name: 'std::atomic<uint64_t>')
if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics64 if (compiler_id == 'clang' or compiler_id == 'gcc') and not has_working_cxx_atomics64
libatomic_dep = compiler.find_library('atomic') 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.links(cxx_atomics64_check_code, dependencies: libatomic_dep, name: 'std::atomic<uint64_t> with libatomic') has_working_cxx_atomics = compiler.links(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') assert(has_working_cxx_atomics, 'Host compiler must support 64-bit std::atomic')
deps_libpistache += libatomic_dep deps_libpistache += libatomic_dep
......
VERSION_MAJOR 0 VERSION_MAJOR 0
VERSION_MINOR 0 VERSION_MINOR 0
VERSION_PATCH 002 VERSION_PATCH 003
VERSION_GIT_DATE 20211002 VERSION_GIT_DATE 20211020
SONAME_VERSION_MAJOR 0 SONAME_VERSION_MAJOR 1
SONAME_VERSION_MINOR 0 SONAME_VERSION_MINOR 0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment