Skip to content

Commit

Permalink
environment: fix LLVM 18 support in get_llvm_tool_names()
Browse files Browse the repository at this point in the history
In 67afddb, we added LLVM 18, but LLVM >= 18
uses a new version scheme of X.Y, not X.0.Y (where using "X" was enough).

See https://discourse.llvm.org/t/rfc-name-the-first-release-from-a-branch-n-1-0-instead-of-n-0-0/75384.

Without this, I get a test failure:
```
 mesonbuild.interpreterbase.exceptions.InterpreterException: Assert failed: config-tool and cmake returns different major versions
   -> frameworks: 15 llvm    (method=combination link-static=False)
```

Fixes: #12961
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
  • Loading branch information
thesamesam authored and eli-schwartz committed Mar 17, 2024
1 parent 0762b86 commit dec93ce
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mesonbuild/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
# unless it becomes a stable release.
suffixes = [
'', # base (no suffix)
'-18.1', '18.1',
'-18', '18',
'-17', '17',
'-16', '16',
Expand Down

0 comments on commit dec93ce

Please sign in to comment.