From dbb867942d70d87e33c62eb648f0ddc301add058 Mon Sep 17 00:00:00 2001 From: Eiden Yoshida <47196116+eidenyoshida@users.noreply.github.com> Date: Fri, 11 Jun 2021 14:43:54 -0600 Subject: [PATCH] Move address-sanitizer build above addition of rccl library in CMakeLists (#392) [ROCm/rccl commit: fb267ea3331ea46e7339fdaa58b7a6aed56002d2] --- projects/rccl/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/rccl/CMakeLists.txt b/projects/rccl/CMakeLists.txt index ce2429c991..185c01803d 100644 --- a/projects/rccl/CMakeLists.txt +++ b/projects/rccl/CMakeLists.txt @@ -97,6 +97,12 @@ else() option(BUILD_SHARED_LIBS "Build as a shared library" ON) endif() +if(BUILD_ADDRESS_SANITIZER) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -shared-libasan") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -shared-libasan") + add_link_options(-fuse-ld=lld) +endif() + configure_file(src/nccl.h.in ${PROJECT_BINARY_DIR}/rccl.h) configure_file(src/nccl.h.in ${PROJECT_BINARY_DIR}/nccl.h) @@ -216,12 +222,6 @@ if("${HIP_COMPILER}" MATCHES "clang") string (REPLACE ";" " " LINK_PROPS "${link_libraries}") set(CMAKE_CXX_ARCHIVE_CREATE " -o ${LINK_PROPS} ") endif() - - if(BUILD_ADDRESS_SANITIZER) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -shared-libasan") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -shared-libasan") - add_link_options(-fuse-ld=lld) - endif() endif() if("${HIP_COMPILER}" MATCHES "hcc")