From d1895af77b65099076a19b3aad57b8523f121930 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 30 May 2022 20:53:02 +0300 Subject: [PATCH 45/45] Msys2 Makefile.meson: Do not use ./win_arch.sh win_arch.sh relies on earlier autotools build having set up the environment, and meson based build cannot rely on such an build having taken place. See osdn #44683 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.meson | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index d6930d7609..227f6dd251 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -9,16 +9,16 @@ # Variable setup # -WINARCH=$(shell ./win_arch.sh) - -ifeq ($(WINARCH),win64) +ifeq ($(MSYSTEM),MINGW64) ARCHDIR=mingw64 LIBGCCDLL=libgcc_s_seh-1.dll CRYPTOLIB_SUFFIX=-x64 -else +else ifeq ($(MSYSTEM),MINGW32) ARCHDIR=mingw32 LIBGCCDLL=libgcc_s_dw2-1.dll CRYPTOLIB_SUFFIX= +else +error "Unsupported MSYSTEM environment" endif ICUVER=69 -- 2.35.1