Skip to content

rocclr: Prioritize local rocr-runtime headers over system paths #5936

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
agunashe merged 2 commits into from
May 13, 2026
Merged

rocclr: Prioritize local rocr-runtime headers over system paths #5936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60263fe
rocclr: Prioritize local rocr-runtime headers over system paths
agunashe May 8, 2026
f65ab2b
fix only the windows AMD_COMPUTE_WIN path
agunashe May 12, 2026
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
16 changes: 9 additions & 7 deletions projects/clr/rocclr/cmake/ROCclrHSA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@

if (AMD_COMPUTE_WIN)
find_path(AMD_HSA_INCLUDE_DIR hsa.h
HINTS
PATHS
${ROCCLR_SRC_DIR}/../../rocr-runtime/runtime/hsa-runtime/inc
${ROCCLR_SRC_DIR}/../../rocr-runtime/runtime/hsa-runtime
${CMAKE_CURRENT_BINARY_DIR}/../../rocr/inc
${CMAKE_CURRENT_BINARY_DIR}/../../rocr
${CMAKE_CURRENT_BINARY_DIR}/../..
${CMAKE_CURRENT_BINARY_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}
${ROCM_PATH}
${ROCM_INSTALL_PATH}
${CMAKE_CURRENT_BINARY_DIR}
PATHS
${CMAKE_CURRENT_BINARY_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/../..
${CMAKE_CURRENT_BINARY_DIR}/../../rocr
PATH_SUFFIXES
include
include/hsa
inc)
inc
NO_DEFAULT_PATH)
Comment thread
agunashe marked this conversation as resolved.
message("Roc CLR: " ${ROCCLR_SRC_DIR} "; HSA headers:" ${AMD_HSA_INCLUDE_DIR})
target_include_directories(rocclr PUBLIC ${AMD_HSA_INCLUDE_DIR})
target_include_directories(rocclr PUBLIC ${AMD_HSA_INCLUDE_DIR}/..)
Expand Down
Loading