From 77b54c35bf9587450cd636e0d7df37e190e28bfb Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 13 Apr 2026 17:01:47 -0400 Subject: Smaller stuff that went uncommitted Signed-off-by: Andrew Opalach --- cross/x86_64-w64-mingw32.txt | 11 ++++++++--- cross/x86_64-w64-msvc-clang.txt | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'cross') diff --git a/cross/x86_64-w64-mingw32.txt b/cross/x86_64-w64-mingw32.txt index 2bc8756..e04d439 100644 --- a/cross/x86_64-w64-mingw32.txt +++ b/cross/x86_64-w64-mingw32.txt @@ -3,15 +3,20 @@ [binaries] c = 'x86_64-w64-mingw32-gcc' cpp = 'x86_64-w64-mingw32-g++' -ar = 'x86_64-w64-mingw32-ar' +# https://github.com/msys2/MINGW-packages/issues/3516 +# https://github.com/mesonbuild/meson/issues/13324 +# https://github.com/msys2/MINGW-packages/issues/11726 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106103 +# https://embeddedartistry.com/blog/2020/04/13/prefer-gcc-ar-to-ar-in-your-buildsystems/ +ar = 'x86_64-w64-mingw32-gcc-ar' strip = 'x86_64-w64-mingw32-strip' windres = 'x86_64-w64-mingw32-windres' dlltool = 'x86_64-w64-mingw32-dlltool' exe_wrapper = 'wine64' [properties] -ar = 'x86_64-w64-mingw32-ar' -nm = 'x86_64-w64-mingw32-nm' +ar = 'x86_64-w64-mingw32-gcc-ar' +nm = 'x86_64-w64-mingw32-gcc-nm' needs_exe_wrapper = true [host_machine] diff --git a/cross/x86_64-w64-msvc-clang.txt b/cross/x86_64-w64-msvc-clang.txt index 01188f3..284dab7 100644 --- a/cross/x86_64-w64-msvc-clang.txt +++ b/cross/x86_64-w64-msvc-clang.txt @@ -11,6 +11,7 @@ pkg-config = '' exe_wrapper = 'wine64' [properties] +ld = 'lld-link' ar = 'llvm-lib' nm = 'llvm-objdump' needs_exe_wrapper = true -- cgit v1.2.3-101-g0448