Skip to content
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.

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

Support llvm headers in ${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/ #419

Merged
merged 1 commit into from
Apr 21, 2023

Conversation

frantisekz
Copy link
Contributor

Fedora places llvm include files into that directory instead of assumed ${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/

Try both, fail horribly when none of them exist

@haonanya haonanya requested review from cdai2, wenju-he and fzou1 April 17, 2023 07:21
set(OPENCL_HEADERS_DIR
"${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/")
else()
message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find LLVM include directory.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find LLVM include directory.")
message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find prebuilt LLVM include directory.")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed.

…OR}/

Fedora places llvm include files into that directory instead of assumed
${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/

Try both, fail horribly when none of them exist
@frantisekz frantisekz force-pushed the support_llvm_major_include branch from bd7f2ab to 1568bb9 Compare April 17, 2023 07:43
Copy link
Contributor

@wenju-he wenju-he left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@haonanya haonanya merged commit 9f50367 into intel:main Apr 21, 2023
@jbeich
Copy link
Contributor

jbeich commented Apr 21, 2023

Fedora places

Likely related to llvm/llvm-project@e1b88c8a09be

pld-gitsync pushed a commit to pld-linux/opencl-clang that referenced this pull request May 20, 2023
multiple upstream fixes for build failures/missing soname from:

intel/opencl-clang#416
intel/opencl-clang#419
intel/opencl-clang#437
intel/opencl-clang#439
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants