From 0282f20a414d3e58b74a67fe100b23f081294058 Mon Sep 17 00:00:00 2001 From: binarybaron Date: Fri, 12 Sep 2025 23:35:07 +0200 Subject: [PATCH] fix(ci): build_winpthreads before finish_gcc to fix windows build error --- dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh b/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh index c26058d7..3e922417 100755 --- a/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh +++ b/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh @@ -238,7 +238,8 @@ prepare_gcc_build() { --prefix=$PREFIX \ --with-sysroot=$PREFIX \ --disable-multilib \ - --enable-languages=c,c++ + --enable-languages=c,c++ \ + --enable-threads=posix make all-gcc -j$(nproc) make install-gcc @@ -308,8 +309,8 @@ setup_path() { } verify_installation() { - # 1. check that ~/opt/gcc-mingw-14.3/ exists - # 2. check that `x86_64-w64-mingw32-g++ --version` works and the output contains 14.3 + # 1. check that ~/opt/gcc-mingw-14.3/ exists + # 2. check that `x86_64-w64-mingw32-g++ --version` works and the output contains 14.3 # 3. make sure the dll's are in the src-tauri directory echo "Verifying cross-compiler installation" @@ -396,12 +397,12 @@ build_binutils build_mingw_headers prepare_gcc_build build_mingw_crt -finish_gcc build_winpthreads +finish_gcc copy_dlls setup_path verify_installation -echo "Done" \ No newline at end of file +echo "Done"