From af3dcbf8a1d75c6a9c649012d97ab1e75486ba09 Mon Sep 17 00:00:00 2001 From: Edjunior Machado Date: Thu, 29 Sep 2022 10:25:03 +0200 Subject: [PATCH] Add llvm-toolset-15.0 --- build-gating.fmf | 4 ++++ lldb-dwz/main.fmf | 3 +++ python-embedded-interpreter/main.fmf | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/build-gating.fmf b/build-gating.fmf index 4f135da..e3a6bcf 100644 --- a/build-gating.fmf +++ b/build-gating.fmf @@ -27,6 +27,10 @@ adjust: environment+: WITH_SCL: "scl enable llvm-toolset-14.0" when: "collection == llvm-toolset-14.0" + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-15.0" + when: "collection == llvm-toolset-15.0" discover: - name: lldb-tests diff --git a/lldb-dwz/main.fmf b/lldb-dwz/main.fmf index e2a10dc..3892b15 100644 --- a/lldb-dwz/main.fmf +++ b/lldb-dwz/main.fmf @@ -25,3 +25,6 @@ adjust: - require+: - llvm-toolset-14.0-lldb when: collection == llvm-toolset-14.0 + - require+: + - llvm-toolset-15.0-lldb + when: collection == llvm-toolset-15.0 diff --git a/python-embedded-interpreter/main.fmf b/python-embedded-interpreter/main.fmf index dd776f4..97c9dfa 100644 --- a/python-embedded-interpreter/main.fmf +++ b/python-embedded-interpreter/main.fmf @@ -31,3 +31,8 @@ adjust: environment+: LLDB_PACKAGE: llvm-toolset-14.0-lldb when: collection == llvm-toolset-14.0 + - require+: + - llvm-toolset-15.0-lldb + environment+: + LLDB_PACKAGE: llvm-toolset-15.0-lldb + when: collection == llvm-toolset-15.0