Update rocprofiler_config_interfaces.cmake to use different elf naming (#1722)
* Update rocprofiler_config_interfaces.cmake to use different elf naming * try out conditional for libelf * run cmake-format to fix formatting issue * Remove libelf.patch file from therock-ci-windows.yml * Remove libelf patch from therock-ci-linux.yml as well
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
590c6c3b4f
Коммит
6e195ded9b
@@ -66,6 +66,7 @@ jobs:
|
||||
run: |
|
||||
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
|
||||
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
|
||||
rm ./TheRock/patches/amd-mainline/rocm-systems/0008-Find-bundled-libelf.patch
|
||||
./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-rocm-systems --no-include-rocm-libraries --no-include-ml-frameworks
|
||||
|
||||
|
||||
|
||||
@@ -54,6 +54,7 @@ jobs:
|
||||
run: |
|
||||
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
|
||||
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
|
||||
rm ./TheRock/patches/amd-mainline/rocm-systems/0008-Find-bundled-libelf.patch
|
||||
git -c user.name="therockbot" -c "user.email=therockbot@amd.com" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch
|
||||
|
||||
- name: Install requirements
|
||||
|
||||
@@ -198,8 +198,13 @@ target_link_libraries(rocprofiler-sdk-ptl INTERFACE PTL::ptl-static)
|
||||
#
|
||||
# ----------------------------------------------------------------------------------------#
|
||||
|
||||
find_package(libelf REQUIRED)
|
||||
target_link_libraries(rocprofiler-sdk-elf INTERFACE libelf::libelf)
|
||||
find_package(LibElf)
|
||||
if(LibElf_FOUND)
|
||||
target_link_libraries(rocprofiler-sdk-elf INTERFACE elf::elf)
|
||||
else()
|
||||
find_package(libelf REQUIRED)
|
||||
target_link_libraries(rocprofiler-sdk-elf INTERFACE libelf::libelf)
|
||||
endif()
|
||||
|
||||
# ----------------------------------------------------------------------------------------#
|
||||
#
|
||||
|
||||
Ссылка в новой задаче
Block a user