intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 12:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Clang] Fix not including clangBasic in the dynamic build

Browse Source 
Summary:
The previous patch only included the needed library if you had HSA and
CUDA installed. Fix that.
This commit is contained in:
Joseph Huber
2023-03-13 12:38:04 -05:00
parent 8d8cca05a2
commit 1b40df1de7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clang/tools/amdgpu-arch/CMakeLists.txt
View File

@@ -14,8 +14,8 @@ add_clang_tool(amdgpu-arch AMDGPUArch.cpp)
find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
if(hsa-runtime64_FOUND AND NOT (LLVM_BUILD_32_BITS OR CMAKE_SIZEOF_VOID_P EQUAL 4))
set_target_properties(amdgpu-arch PROPERTIES INSTALL_RPATH_USE_LINK_PATH ON)
target_link_libraries(amdgpu-arch PRIVATE hsa-runtime64::hsa-runtime64)
clang_target_link_libraries(amdgpu-arch PRIVATE clangBasic)
target_link_libraries(amdgpu-arch PRIVATE hsa-runtime64::hsa-runtime64 clangBasic)
else()
target_compile_definitions(amdgpu-arch PRIVATE "DYNAMIC_HSA")
target_link_libraries(amdgpu-arch PRIVATE clangBasic)
endif()

4
clang/tools/nvptx-arch/CMakeLists.txt
View File

@@ -13,8 +13,8 @@ find_package(CUDAToolkit QUIET)
# If we found the CUDA library directly we just dynamically link against it.
if(CUDAToolkit_FOUND AND NOT (LLVM_BUILD_32_BITS OR CMAKE_SIZEOF_VOID_P EQUAL 4))
target_link_libraries(nvptx-arch PRIVATE CUDA::cuda_driver)
clang_target_link_libraries(nvptx-arch PRIVATE clangBasic)
target_link_libraries(nvptx-arch PRIVATE CUDA::cuda_driver clangBasic)
else()
target_compile_definitions(nvptx-arch PRIVATE "DYNAMIC_CUDA")
target_link_libraries(nvptx-arch PRIVATE clangBasic)
endif()