Skip to content

Commit

Permalink
Don't set `CPACK_RPM_MAIN_COMPONENT' for ASAN builds
Browse files Browse the repository at this point in the history
Setting `CPACK_RPM_MAIN_COMPONENT` to any component causes the package name for that component to be automatically generated from `CPACK_PACKAGE_NAME` (ignoring the other work we've done to correct the name), which in particular causes the runtime packages for ASAN builds to not be generated with the ASAN suffix.

In order to minimize the impact, I'm disabling this call only in the case that we're doing an ASAN build, I don't want to break any other spots where it is actually working correctly, but I think we should investigate removing this entirely.
  • Loading branch information
lawruble13 committed Jul 19, 2024
1 parent a452962 commit 0f3cada
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,9 @@ macro(rocm_set_comp_cpackvar HEADER_ONLY NAME_SUFFIX components)
set(CPACK_DEBIAN_RUNTIME_FILE_NAME "DEB-DEFAULT")
endif()
if (NOT ${HEADER_ONLY} AND BUILD_SHARED_LIBS)
set(CPACK_RPM_MAIN_COMPONENT "runtime")
if (NOT ENABLE_ASAN_PACKAGING)
set(CPACK_RPM_MAIN_COMPONENT "runtime")
endif()
list(APPEND CPACK_COMPONENTS_ALL runtime)
endif()
endif()
Expand Down

0 comments on commit 0f3cada

Please sign in to comment.