ci: Use MinGW toolchain with Win32 threads.

It seems impossible to statically link libwinpthread DLL on release builds
at least with CMake.

Fixes #82

Author: jrfonseca

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: downloads/*.7z
-        key: ${{ runner.os }}-${{ matrix.target }}-mingw-12.2.0-dbghelp-10.0.18362.1
+        key: ${{ runner.os }}-${{ matrix.target }}-mingw-12.2.0-win32-dbghelp-10.0.18362.1
     - run: Get-Host | Select-Object Version
     - run: python -m pip install gcovr codecov
     - name: Build

BUILD.md

@@ -5,7 +5,9 @@
 
 Required:
 
- * [MinGW](https://github.com/brechtsanders/winlibs_mingw/releases) toolchain
+ * [MinGW](https://github.com/niXman/mingw-builds-binaries) toolchain
+
+   * _win32_ threads (as opposed to _posix_ threads) is recommended to avoid dependency on `libwinpthread-1.dll`
 
  * [CMake](http://www.cmake.org/)
 

CMakeLists.txt

@@ -13,6 +13,7 @@ set (CPACK_PACKAGE_VERSION_PATCH "8")
 
 
 option (ENABLE_COVERAGE "Enable code coverage." OFF)
+option (POSIX_THREADS "Allow posix threads." OFF)
 
 
 ##############################################################################
@@ -65,6 +66,24 @@ add_compiler_flags (-fno-strict-aliasing)
 
 include (StaticCRT)
 
+# Avoid Posix threads.  Posix threads is required for support of certain C++11
+# multi-threading features, but it introduces a new DLL dependency and we don't
+# use those features.
+execute_process (
+    COMMAND "${CMAKE_COMMAND}" -E echo "#include <thread>\n#ifdef _GLIBCXX_HAS_GTHREADS\n#error _GLIBCXX_HAS_GTHREADS\n#endif"
+    COMMAND "${CMAKE_CXX_COMPILER}" -x c++ -E -
+    RESULT_VARIABLE STATUS_CXX11_THREADS
+    OUTPUT_QUIET
+    ERROR_QUIET
+)
+if (NOT STATUS_CXX11_THREADS EQUAL 0)
+    if (POSIX_THREADS)
+        message (WARNING "Win32 threads recommended.")
+    else ()
+        message (SEND_ERROR "Win32 threads required.")
+    endif ()
+endif ()
+
 # Enable stack protection
 # XXX: Broken on https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86832
 if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0" OR

ci/build.ps1

@@ -18,10 +18,10 @@ function Exec {
     }
 }
 
-$MINGW_64_URL = 'https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-msvcrt-r2/winlibs-x86_64-posix-seh-gcc-12.2.0-llvm-14.0.6-mingw-w64msvcrt-10.0.0-r2.7z'
-$MINGW_32_URL = 'https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-msvcrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64msvcrt-10.0.0-r2.7z'
-$MINGW_64_SUM = 'c0dd9f2113a151dd2fe3dce8ceb30df90120fab4537349d7c0ee22e9ff4fe3bc'
-$MINGW_32_SUM = '80ab3fb4b65870509f968e07e44f90d216eaf130fe9eb320b7a98285a84a0d2e'
+$MINGW_64_URL = 'https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/x86_64-12.2.0-release-win32-seh-msvcrt-rt_v10-rev2.7z'
+$MINGW_32_URL = 'https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/i686-12.2.0-release-win32-dwarf-msvcrt-rt_v10-rev2.7z'
+$MINGW_64_SUM = 'dbe4de36401906f296c2752afd512891a227a787f3b9cf10115b409feaef39aa'
+$MINGW_32_SUM = 'd76daf7a176f6e65ff75adc26efbadba89787bb14265696b94dce302cf1f8115'
 
 $DBGHELP_64_URL = 'https://gist.githubusercontent.com/jrfonseca/55a9a0e0e228ad841032df1624da5e27/raw/8b5f0a1578be701128f09f886f9636389ae60268/dbghelp-win64.7z'
 $DBGHELP_32_URL = 'https://gist.githubusercontent.com/jrfonseca/55a9a0e0e228ad841032df1624da5e27/raw/8b5f0a1578be701128f09f886f9636389ae60268/dbghelp-win32.7z'
@@ -131,9 +131,6 @@ Exec { cmake --build $buildDir --use-stderr --target test }
 # MinGW GCC
 Exec { cmake "-S" tests\apps "-B" "$buildRoot\apps\$target" -G $generator "-DCMAKE_BUILD_TYPE=Debug" }
 Exec { cmake --build "$buildRoot\apps\$target" }
-# MinGW Clang
-Exec { cmake "-S" tests\apps "-B" "$buildRoot\apps\$target-clang" -G $generator "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_C_COMPILER=clang" "-DCMAKE_CXX_COMPILER=clang++" "-DCMAKE_C_FLAGS_DEBUG=-g" "-DCMAKE_CXX_FLAGS_DEBUG=-g" }
-Exec { cmake --build "$buildRoot\apps\$target-clang" }
 # MSVC 32-bits
 Exec { cmake "-S" tests\apps "-B" "$buildRoot\apps\msvc32" -G "Visual Studio 17 2022" -A Win32 }
 Exec { cmake --build "$buildRoot\apps\msvc32" --config Debug "--" /verbosity:minimal /maxcpucount }
@@ -142,9 +139,9 @@ if ($target -eq "mingw64") {
     Exec { cmake -Stests\apps "-B$buildRoot\apps\msvc64" -G "Visual Studio 17 2022" -A x64 }
     Exec { cmake --build "$buildRoot\apps\msvc64" --config Debug "--" /verbosity:minimal /maxcpucount }
 
-    Exec { python ci\spawndesk.py python tests\apps\test.py $buildDir\bin\catchsegv.exe "$buildRoot\apps\$target" "$buildRoot\apps\$target-clang" "$buildRoot\apps\msvc32\Debug" "$buildRoot\apps\msvc64\Debug" }
+    Exec { python ci\spawndesk.py python tests\apps\test.py $buildDir\bin\catchsegv.exe "$buildRoot\apps\$target" "$buildRoot\apps\msvc32\Debug" "$buildRoot\apps\msvc64\Debug" }
 } else {
-    Exec { python ci\spawndesk.py python tests\apps\test.py $buildDir\bin\catchsegv.exe "$buildRoot\apps\$target" "$buildRoot\apps\$target-clang" "$buildRoot\apps\msvc32\Debug" }
+    Exec { python ci\spawndesk.py python tests\apps\test.py $buildDir\bin\catchsegv.exe "$buildRoot\apps\$target" "$buildRoot\apps\msvc32\Debug" }
 }
 
 #

ci/build.sh

@@ -22,8 +22,8 @@ test ! -d /usr/lib/ccache || export PATH="/usr/lib/ccache:$PATH"
 
 WINE=${WINE:-$(which wine)}
 
-x86_64-w64-mingw32-g++-posix --version
-i686-w64-mingw32-g++-posix --version
+x86_64-w64-mingw32-g++-win32 --version
+i686-w64-mingw32-g++-win32 --version
 ninja --version
 cmake --version
 python3 --version

ci/toolchain/i686-w64-mingw32-gcc.cmake

@@ -1,7 +1,7 @@
 set (CMAKE_SYSTEM_NAME Windows)
 set (CMAKE_SYSTEM_PROCESSOR X86)
-set (CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix)
-set (CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
+set (CMAKE_C_COMPILER i686-w64-mingw32-gcc-win32)
+set (CMAKE_CXX_COMPILER i686-w64-mingw32-g++-win32)
 set (CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 set (CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

ci/toolchain/x86_64-w64-mingw32-gcc.cmake

@@ -1,7 +1,7 @@
 set (CMAKE_SYSTEM_NAME Windows)
 set (CMAKE_SYSTEM_PROCESSOR AMD64)
-set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
-set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
+set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-win32)
+set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-win32)
 set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
 set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

cmake/StaticCRT.cmake

@@ -27,11 +27,9 @@ if (MINGW)
             ERROR_QUIET
         )
         if (NOT STATUS_CXX11_THREADS EQUAL 0)
-            message (STATUS "MinGW with POSIX threads detected.")
             # https://stackoverflow.com/a/28001271
+            # XXX Unfortunately this doesn't work for Release builds, https://github.com/jrfonseca/drmingw/issues/82
             set (CMAKE_CXX_STANDARD_LIBRARIES "-Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic ${CMAKE_CXX_STANDARD_LIBRARIES}")
-        else ()
-            message (STATUS "MinGW with Win32 threads detected.")
         endif ()
     endif ()
 endif ()