From c059b2270724b2c02416d7d7d45e23a5e994cda5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Mon, 27 Apr 2020 18:46:32 +0200 Subject: [PATCH] gitlab-ci: Install g++-mingw-w64-x86-64-win32 instead of mingw-w64 mingw-w64 pulls in a lot more packages we don't need. g++-mingw-w64-x86-64-win32 is only available in Debian testing, so get all mingw packages from there. Acked-by: Andres Gomez Part-of: --- .gitlab-ci/container/x86_build.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 6346e12abaf..d9c88abf220 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -121,11 +121,6 @@ done apt-get install -y --no-remove -t buster-backports \ llvm-8-dev \ -# for 64bit windows cross-builds -apt-get install -y --no-remove \ - libz-mingw-w64-dev \ - mingw-w64 - # Install packages we need from Debian testing last, to avoid pulling in more @@ -136,6 +131,8 @@ apt-get install -y -t testing \ libstdc++6:s390x apt-get install -y --no-remove -t testing \ + g++-mingw-w64-x86-64-win32 \ + libz-mingw-w64-dev \ wine \ wine32 \ wine64 -- 2.30.2