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

CMake: fix incorrect version for finding llvm-config #12150

Conversation

stephanlachnit
Copy link
Contributor

This Pull request:

Changes or fixes:

Fixes that CMake was still trying to look for llvm-config-9 instead of llvm-config-13 after for #10294.

To prevent this I added two variable in the beginning of the file so that it is less likely to be forgotten next time. I also moved the versioned version before the unversioned one. This should make sure it actually takes the right version if llvm-config defaults to a version that is not 13 (currently the case in Debian e.g.).

/cc @hahnjo @vgvassilev @bellenot

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

@phsft-bot
Copy link
Collaborator

Can one of the admins verify this patch?

Copy link
Member

@vgvassilev vgvassilev left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@hahnjo
Copy link
Member

hahnjo commented Jan 29, 2023

@phsft-bot build

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac12/noimt, mac11/cxx14, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu2004/python3.
See console output.

@hahnjo
Copy link
Member

hahnjo commented Jan 29, 2023

@phsft-bot build just on ROOT-ubuntu2004/python3

@phsft-bot
Copy link
Collaborator

Starting build on ROOT-ubuntu2004/python3
How to customize builds

@phsft-bot
Copy link
Collaborator

Build failed on ROOT-ubuntu2004/python3.
See console output.

Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

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

Not sure why the clone of root.git fails on Ubuntu 20.04, but seems unrelated to the changes here.

@hahnjo hahnjo merged commit 37b2521 into root-project:master Jan 30, 2023
Axel-Naumann pushed a commit that referenced this pull request Jan 30, 2023
Signed-off-by: Stephan Lachnit <[email protected]>
(cherry picked from commit 37b2521)
@stephanlachnit stephanlachnit deleted the p-find-system-llvm-config-fix-version branch January 30, 2023 08:30
omazapa pushed a commit to omazapa/root that referenced this pull request Apr 13, 2023
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