Commit 198563a
rocclr: Prioritize local rocr-runtime headers over system paths (#5936)
Fixes build errors where CMake finds outdated HSA headers in system
paths instead of the local rocr-runtime
Changes applied to windows builds using ROCclrHSA.cmake:
- Reorder find_path/find_package to search local rocr-runtime first
- Add NO_DEFAULT_PATH to prevent system path searches
- Covers Windows (AMD_COMPUTE_WIN)
## Motivation
when building hip, the headers and libs should be obtained locally first
then at the system level.
User can have multiple rocms installed at system level. During hip
build, user expects the local rocr/hsa to be picked first
## Technical Details
changing the search order of rocr headers and libs, so the expected
Libs/headers are picked for the hip build
## JIRA ID
NA
## Test Plan
Rock build passes and local hip build passes
## Test Result
Rock build passes and local hip build passes
## Submission Checklist
- [x] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
---------
Co-authored-by: Claude Sonnet 4 <noreply@anthropic.com>1 parent 61f05b2 commit 198563a
1 file changed
Lines changed: 9 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
| 8 | + | |
8 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
9 | 15 | | |
10 | 16 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | | - | |
| 20 | + | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| |||
0 commit comments