From dd300e79d153950d7dc7ccfd6f1d6e22feb7a94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sat, 31 Jul 2021 17:05:33 +0200 Subject: [PATCH] Don't complain about missing msvc libs when trying to compile with mingw gcc (... which is not supported, so the libs for it are indeed missing, but the error message still involves msvc, which is wrong.) --- meson.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 1dcbdbeff..303e578a4 100644 --- a/meson.build +++ b/meson.build @@ -76,16 +76,15 @@ if use_tpt_libs != 'no' if copt_architecture == 'x86_64' and copt_platform == 'win' and copt_compiler == 'gcc' nope = true endif + if nope + error('no prebuilt @0@-@1@-@2@-@3@ libraries are currently provided'.format(copt_architecture, copt_platform, copt_compiler, use_tpt_libs)) + endif quad_compiler = copt_compiler if use_tpt_libs == 'dynamic' and copt_platform == 'win' # DLLs should be compatible with anything, right? quad_compiler = 'msvc' endif - quad = '@0@-@1@-@2@-@3@'.format(copt_architecture, copt_platform, quad_compiler, use_tpt_libs) - if nope - error('no prebuilt @0@ libraries are currently provided'.format(quad)) - endif - tpt_libs = subproject('tpt-libs-prebuilt-@0@-@1@'.format(quad, tpt_libs_vtag)) + tpt_libs = subproject('tpt-libs-prebuilt-@0@-@1@-@2@-@3@-@4@'.format(copt_architecture, copt_platform, quad_compiler, use_tpt_libs, tpt_libs_vtag)) endif uopt_native = get_option('native')