From 8870f71bebda999d8a37e1f6b763477118e9e9ca Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 20 Nov 2023 16:11:53 -0600 Subject: [PATCH] Stop declaring pkg-config binary in win64 cross file Meson 1.3.0 deprecates the setting in favor of "pkg-config" with a dash. We were just restating the default, so the setting isn't necessary; remove it. Signed-off-by: Benjamin Gilbert --- machines/cross-win64.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/machines/cross-win64.ini b/machines/cross-win64.ini index 37a027aa..5bca6f0b 100644 --- a/machines/cross-win64.ini +++ b/machines/cross-win64.ini @@ -18,8 +18,6 @@ cpp = 'x86_64-w64-mingw32-g++' ld = 'x86_64-w64-mingw32-ld' objcopy = 'x86_64-w64-mingw32-objcopy' objdump = 'x86_64-w64-mingw32-objdump' -# Fedora's ${build_host}-pkg-config clobbers search paths; avoid it -pkgconfig = 'pkg-config' strip = 'x86_64-w64-mingw32-strip' windres = 'x86_64-w64-mingw32-windres'