use UCRT64 instead of MINGW64

spatial-model-editor · Jan 19, 2024 · dbd3ea4 · dbd3ea4
1 parent 5d1e664
commit dbd3ea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -138,9 +138,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: UCRT64
           update: true
-          install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-python make m4 git diffutils flex bison mingw-w64-x86_64-binutils mingw-w64-x86_64-crt mingw-w64-x86_64-headers mingw-w64-x86_64-gmp mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-zlib mingw-w64-x86_64-zstd mingw-w64-x86_64-gperf mingw-w64-x86_64-autotools
+          install: mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-python make m4 git diffutils flex bison
       - name: Build script
         run: ./build.sh
       - uses: actions/upload-artifact@v4

diff --git a/build.sh b/build.sh
@@ -58,9 +58,6 @@ if [[ "$OS_TARGET" != "osx" ]]; then
     GFORTRAN_INSTALL_PREFIX=/opt/gfortranfpic
 
     if [[ "$OS_TARGET" == "win64-mingw" ]]; then
-        which cpp
-        whereis cpp
-        /mingw64/bin/cpp --version
         # gcc configure script assumes these dirs exist and build fails if they don't
         # https://wiki.osdev.org/GCC_Cross-Compiler#Building_GCC:_the_directory_that_should_contain_system_headers_does_not_exist
         mkdir -p $SYSROOT/mingw/include