Skip to content

Commit

Permalink
Revert "PS-9379 Fix problem with "-latomic" on some platorms in uuid_…
Browse files Browse the repository at this point in the history
…vx component (percona#5407)" (percona#5433)

This reverts commit 6bba53b.
  • Loading branch information
percona-ysorokin authored and lukin-oleksiy committed Oct 23, 2024
1 parent 05b722a commit 2bf128c
Showing 1 changed file with 2 additions and 22 deletions.
24 changes: 2 additions & 22 deletions components/uuid_vx_udf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,6 @@ MYSQL_ADD_COMPONENT(uuid_vx_udf

target_include_directories(component_uuid_vx_udf SYSTEM PRIVATE ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})

# Check if -latomic is required or not
if (NOT MSVC)
include(CheckCXXSourceCompiles)
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
# Adding "-w" compiler option to suppres all possible warnings
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c++17 -w)
check_cxx_source_compiles("
#include <atomic>
std::atomic<uint64_t> x(0);
int main() {
uint64_t i = x.load(std::memory_order_relaxed);
bool b = x.is_lock_free();
return 0;
}
" uuid_vx_HAVE_BUILTIN_ATOMICS)
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
if (uuid_vx_HAVE_BUILTIN_ATOMICS)
message(STATUS "Building UUID_VX UDF component without libatomic")
else()
message(STATUS "Building UUID_VX UDF component with libatomic")
target_link_libraries(component_uuid_vx_udf PRIVATE atomic)
endif()
if(NOT APPLE)
target_link_libraries(component_uuid_vx_udf PRIVATE atomic)
endif()

0 comments on commit 2bf128c

Please sign in to comment.