Skip to content

Fix ASAN build #7629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfc-gh-ahusain merged 3 commits into from
Jul 20, 2022
Merged

Fix ASAN build #7629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8bc37a
Fix ASAN build
sfc-gh-ahusain Jul 19, 2022
da54c62
Fix ASAN build
sfc-gh-ahusain Jul 20, 2022
9527478
Fix ASAN build
sfc-gh-ahusain Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions cmake/CompileBoost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,20 @@ function(compile_boost)
set(BOOST_LINK_FLAGS "")
if(APPLE OR CLANG OR ICX OR USE_LIBCXX)
list(APPEND BOOST_COMPILER_FLAGS -stdlib=libc++ -nostdlib++)
list(APPEND BOOST_LINK_FLAGS -static-libgcc -lc++ -lc++abi)
list(APPEND BOOST_LINK_FLAGS -lc++ -lc++abi)
if (NOT APPLE)
list(APPEND BOOST_LINK_FLAGS -static-libgcc)
endif()
endif()

# Update the user-config.jam
set(BOOST_ADDITIONAL_COMPILE_OPTIONS "")
foreach(flag IN LISTS BOOST_COMPILER_FLAGS COMPILE_BOOST_CXXFLAGS)
string(APPEND BOOST_ADDITIONAL_COMPILE_OPTIONS "<cxxflags>${flag} ")
endforeach()
#foreach(flag IN LISTS BOOST_LINK_FLAGS COMPILE_BOOST_LDFLAGS)
# string(APPEND BOOST_ADDITIONAL_COMPILE_OPTIONS "<linkflags>${flag} ")
#endforeach()
foreach(flag IN LISTS BOOST_LINK_FLAGS COMPILE_BOOST_LDFLAGS)
string(APPEND BOOST_ADDITIONAL_COMPILE_OPTIONS "<linkflags>${flag} ")
endforeach()
configure_file(${CMAKE_SOURCE_DIR}/cmake/user-config.jam.cmake ${CMAKE_BINARY_DIR}/user-config.jam)
set(USER_CONFIG_FLAG --user-config=${CMAKE_BINARY_DIR}/user-config.jam)

Expand Down
7 changes: 0 additions & 7 deletions fdbclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ if(WITH_AWS_BACKUP)
include(awssdk)
endif()

find_package(ZLIB)
if(ZLIB_FOUND)
add_compile_definitions(ZLIB_LIB_SUPPORTED)
else()
message(STATUS "ZLIB package not found")
endif()

add_flow_target(STATIC_LIBRARY NAME fdbclient SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs})
target_include_directories(fdbclient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/versions.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/fdbclient/versions.h)
Expand Down
7 changes: 0 additions & 7 deletions fdbserver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/workloads)

add_flow_target(EXECUTABLE NAME fdbserver SRCS ${FDBSERVER_SRCS})

find_package(ZLIB)
if(ZLIB_FOUND)
add_compile_definitions(ZLIB_LIB_SUPPORTED)
else()
message(STATUS "ZLIB package not found")
endif()

target_include_directories(fdbserver PRIVATE
${CMAKE_SOURCE_DIR}/bindings/c
${CMAKE_BINARY_DIR}/bindings/c
Expand Down
4 changes: 2 additions & 2 deletions flow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ target_link_libraries(flowlinktest PRIVATE flow stacktrace)

find_package(ZLIB)
if(ZLIB_FOUND)
add_compile_definitions(ZLIB_LIB_SUPPORTED)
target_link_libraries(flow PRIVATE ZLIB::ZLIB)
target_compile_definitions(flow PUBLIC ZLIB_LIB_SUPPORTED)
target_link_libraries(flow PUBLIC ZLIB::ZLIB)
else()
message(STATUS "ZLIB package not found")
endif()
Expand Down