From 11bb8aa83e57b288241b9156706e6f8d25eaf383 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Sun, 2 Aug 2020 00:47:21 +0430 Subject: [PATCH] [meson] limit check-libstdc++ check to 0.55 library(..., link_language: 'c') is introduced in 0.55 but we were relying on this anyway assuming b_asneeded being true on meson. #2614 --- src/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 419596e84..853e0eb10 100644 --- a/src/meson.build +++ b/src/meson.build @@ -712,7 +712,10 @@ if get_option('tests').enabled() env.set('HBHEADERS', ' '.join(HBHEADERS)) if cpp.get_id() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable - dist_check_script += ['check-libstdc++', 'check-static-inits', 'check-symbols'] + if meson.version().version_compare('>=0.55') + dist_check_script += 'check-libstdc++' + endif + dist_check_script += ['check-static-inits', 'check-symbols'] endif foreach name : dist_check_script