From e2e6fd2e61a0b284d47a55dfd52e7e4f485d683d Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 6 Jun 2023 21:45:21 -0400 Subject: tests: update llvm version exclusions for hopefully the last time This is now fixed upstream and expected to be backported to the next point release. --- test cases/frameworks/15 llvm/meson.build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build index 806ba7bc3..3f0e29859 100644 --- a/test cases/frameworks/15 llvm/meson.build +++ b/test cases/frameworks/15 llvm/meson.build @@ -25,9 +25,8 @@ if(method == 'combination') method : 'config-tool', ) - # Bump the version along till the LLVM bug is fixed - if static and d.version().startswith('16.0') and d.version()[5].to_int() <= 4 - message('Skipping modules with cmake, see https://github.com/mesonbuild/meson/issues/11642') + if static and d.version().startswith('16.0') and d.version()[5].to_int() <= 6 + message('Skipping modules with cmake due to an LLVM bug, see https://github.com/mesonbuild/meson/issues/11642') llvm_cm_dep = dependency( 'llvm', required : false, @@ -82,9 +81,8 @@ else dep_tinfo = cpp.find_library('tinfo', required: false) endif - # Bump the version along till the LLVM bug is fixed - if static and method == 'cmake' and d.version().startswith('16.0') and d.version()[5].to_int() <= 4 - message('Skipping modules with cmake, see https://github.com/mesonbuild/meson/issues/11642') + if static and method == 'cmake' and d.version().startswith('16.0') and d.version()[5].to_int() <= 5 + message('Skipping modules with cmake due to an LLVM bug, see https://github.com/mesonbuild/meson/issues/11642') llvm_dep = dependency( 'llvm', required : false, -- cgit v1.2.3