diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
| commit | 6aec87544c675751141100d6efe3a2d943cb528f (patch) | |
| tree | 8771c79790e0b58df172e48214a5077899a9b312 /storage/rocksdb/build_rocksdb.cmake | |
| parent | 70a515df434a57709eaf69f451c22739d7908ba4 (diff) | |
| parent | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (diff) | |
| download | mariadb-git-6aec87544c675751141100d6efe3a2d943cb528f.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/rocksdb/build_rocksdb.cmake')
| -rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index fd23b7ba470..7ccd52283f3 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -129,10 +129,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64|powerpc64") ADD_DEFINITIONS(-DHAVE_POWER8 -DHAS_ALTIVEC) endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64|powerpc64") -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") - set(SYSTEM_LIBS ${SYSTEM_LIBS} -latomic) -endif() - option(WITH_FALLOCATE "build with fallocate" ON) if(WITH_FALLOCATE AND UNIX) @@ -161,9 +157,9 @@ include_directories(SYSTEM ${ROCKSDB_SOURCE_DIR}/third-party/gtest-1.7.0/fused-s find_package(Threads REQUIRED) if(WIN32) - set(SYSTEM_LIBS ${SYSTEM_LIBS} Shlwapi.lib Rpcrt4.lib) + set(SYSTEM_LIBS ${SYSTEM_LIBS} ${ATOMIC_EXTRA_LIBS} Shlwapi.lib Rpcrt4.lib) else() - set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${CMAKE_DL_LIBS}) + set(SYSTEM_LIBS ${SYSTEM_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${CMAKE_DL_LIBS} ${ATOMIC_EXTRA_LIBS}) endif() set(ROCKSDB_LIBS rocksdblib}) |