From ed4d0892d7666bc7610ed4688ef2f1fa87ad0d2a Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:23:20 +0200
Subject: [PATCH] Build fixed versions of toolchains to make release builds
 reproducible

---
 cmake/aarch64_toolchain_clang.cmake           |   4 +-
 cmake/riscv64_toolchain_clang.cmake           |   4 +-
 cmake/windows_x86_64_toolchain_clang.cmake    |   4 +-
 release_scripts/images/ubuntu/prepare.sh      | 328 +++++++++++++++++-
 .../linux_aarch64/p2pool_linux_aarch64.sh     |   2 +-
 .../linux_riscv64/p2pool_linux_riscv64.sh     |   2 +-
 release_scripts/linux_x64/p2pool_linux_x64.sh |   8 +-
 release_scripts/windows_x64/Dockerfile        |   2 +-
 release_scripts/windows_x64/intrin-impl.patch |  11 -
 .../windows_x64/p2pool_windows_x64.sh         |  15 +-
 10 files changed, 342 insertions(+), 38 deletions(-)
 delete mode 100644 release_scripts/windows_x64/intrin-impl.patch

diff --git a/cmake/aarch64_toolchain_clang.cmake b/cmake/aarch64_toolchain_clang.cmake
index 1c52bf5..eda0a8d 100644
--- a/cmake/aarch64_toolchain_clang.cmake
+++ b/cmake/aarch64_toolchain_clang.cmake
@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(CMAKE_C_COMPILER clang-20)
-set(CMAKE_CXX_COMPILER clang++-20)
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
 set(CMAKE_ASM_COMPILER aarch64-linux-gnu-as)
 set(CMAKE_STRIP aarch64-linux-gnu-strip)
diff --git a/cmake/riscv64_toolchain_clang.cmake b/cmake/riscv64_toolchain_clang.cmake
index 0f16949..bbdd6a4 100644
--- a/cmake/riscv64_toolchain_clang.cmake
+++ b/cmake/riscv64_toolchain_clang.cmake
@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR riscv64)
 
-set(CMAKE_C_COMPILER clang-20)
-set(CMAKE_CXX_COMPILER clang++-20)
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
 set(CMAKE_ASM_COMPILER riscv64-linux-gnu-as)
 set(CMAKE_STRIP riscv64-linux-gnu-strip)
diff --git a/cmake/windows_x86_64_toolchain_clang.cmake b/cmake/windows_x86_64_toolchain_clang.cmake
index 20989de..b41726b 100644
--- a/cmake/windows_x86_64_toolchain_clang.cmake
+++ b/cmake/windows_x86_64_toolchain_clang.cmake
@@ -4,5 +4,5 @@ set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_VERSION 6.0)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
-set(CMAKE_C_COMPILER clang-20)
-set(CMAKE_CXX_COMPILER clang++-20)
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
diff --git a/release_scripts/images/ubuntu/prepare.sh b/release_scripts/images/ubuntu/prepare.sh
index e14f48a..7c593e4 100755
--- a/release_scripts/images/ubuntu/prepare.sh
+++ b/release_scripts/images/ubuntu/prepare.sh
@@ -1,9 +1,325 @@
 #!/bin/sh
 
-export DEBIAN_FRONTEND=noninteractive
-apt-get update && apt-get upgrade -yq --no-install-recommends
-apt-get install -yq --no-install-recommends patch lsb-release wget software-properties-common gnupg p7zip cmake make gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64
+# Software versions to install
 
-wget https://apt.llvm.org/llvm.sh
-chmod +x llvm.sh
-./llvm.sh 20 all
+BINUTILS_VERSION=2_44
+CLANG_VERSION=20.1.7
+CMAKE_VERSION=4.0.3
+GCC_VERSION=15.1.0
+GLIBC_VERSION=2.41
+LINUX_HEADERS_VERSION=6.15.4
+MAKE_VERSION=4.4.1
+MINGW_VERSION=12.0.0
+
+CMAKE_SHA256="585ae9e013107bc8e7c7c9ce872cbdcbdff569e675b07ef57aacfb88c886faac"
+GLIBC_SHA256="a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901"
+HEADERS_SHA256="0eafd627b602f58d73917d00e4fc3196ba18cba67df6995a42aa74744d8efa16"
+MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
+
+echo "Install prerequisites"
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update && apt-get upgrade -yq --no-install-recommends
+apt-get install -yq --no-install-recommends ca-certificates curl p7zip bzip2 flex texinfo bison ninja-build python3 file rsync xz-utils gawk gettext git gcc g++ make
+
+echo "Install GCC"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-$GCC_VERSION git://gcc.gnu.org/git/gcc.git
+rm -rf gcc/.git
+
+cd gcc
+contrib/download_prerequisites
+cd ..
+
+mkdir gcc_build && cd gcc_build
+../gcc/configure --enable-languages=c,c++ --disable-multilib
+
+make -j$(nproc) bootstrap
+make install
+
+echo "Install gmp version from GCC"
+
+cd /root/gcc_build/gmp
+make install
+
+echo "Install mpfr version from GCC"
+
+cd /root/gcc_build/mpfr
+make install
+
+echo "Install binutils"
+
+cd /root
+
+git clone --depth 1 --branch binutils-$BINUTILS_VERSION git://sourceware.org/git/binutils-gdb.git
+rm -rf binutils-gdb/.git
+
+cp -r binutils-gdb binutils-gdb-aarch64
+cp -r binutils-gdb binutils-gdb-riscv64
+cp -r binutils-gdb binutils-gdb-w64
+
+cd binutils-gdb
+
+CFLAGS='-std=gnu11 -O2' ./configure
+make -j$(nproc)
+make install
+
+echo "Install cmake"
+
+cd /root
+
+CMAKE_NAME=cmake-$CMAKE_VERSION-linux-x86_64
+CMAKE_FILE=$CMAKE_NAME.tar.gz
+
+curl -L -O https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/$CMAKE_FILE
+
+CMAKE_FILE_SHA256="$(sha256sum $CMAKE_FILE | awk '{ print $1 }')"
+
+if [ $CMAKE_FILE_SHA256 != $CMAKE_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $CMAKE_FILE - expected $CMAKE_SHA256, got $CMAKE_FILE_SHA256"
+    exit 1
+fi
+
+tar xvf $CMAKE_FILE
+cp $CMAKE_NAME/bin/* /usr/local/bin
+cp -r $CMAKE_NAME/share/cmake-4.0 /usr/local/share
+
+echo "Install make"
+
+cd /root
+
+MAKE_NAME=make-$MAKE_VERSION
+MAKE_FILE=$MAKE_NAME.tar.gz
+
+curl -L -O https://ftp.gnu.org/gnu/make/$MAKE_FILE
+
+MAKE_FILE_SHA256="$(sha256sum $MAKE_FILE | awk '{ print $1 }')"
+
+if [ $MAKE_FILE_SHA256 != $MAKE_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $MAKE_FILE - expected $MAKE_SHA256, got $MAKE_FILE_SHA256"
+    exit 1
+fi
+
+tar xvf $MAKE_FILE
+cd $MAKE_NAME
+CFLAGS='-O2' ./configure
+make
+cp -f make /usr/bin
+
+echo "Install clang"
+
+cd /root
+
+git clone --depth 1 --branch llvmorg-$CLANG_VERSION https://github.com/llvm/llvm-project.git
+
+cd llvm-project
+mkdir build && cd build
+cmake -G Ninja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLLVM_ENABLE_PROJECTS="clang;lld;libc" -DCMAKE_BUILD_TYPE=Release -DLLVM_VERSION_SUFFIX="_p2pool" ../llvm
+ninja
+ninja install
+
+cd ..
+mkdir build_runtimes
+cmake -G Ninja -S runtimes -B build_runtimes -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+ninja -C build_runtimes cxx cxxabi unwind
+ninja -C build_runtimes install
+
+echo "Install binutils for aarch64-linux-gnu"
+
+cd /root/binutils-gdb-aarch64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=aarch64-linux-gnu
+make -j$(nproc)
+make install
+
+echo "Install Linux headers for aarch64-linux-gnu"
+
+cd /root
+
+HEADERS_FILE=linux-$LINUX_HEADERS_VERSION.tar.xz
+
+curl -L -O https://www.kernel.org/pub/linux/kernel/v6.x/$HEADERS_FILE
+
+HEADERS_FILE_SHA256="$(sha256sum $HEADERS_FILE | awk '{ print $1 }')"
+
+if [ $HEADERS_FILE_SHA256 != $HEADERS_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $HEADERS_FILE - expected $HEADERS_SHA256, got $HEADERS_FILE_SHA256"
+    exit 1
+fi
+
+tar xf linux-$LINUX_HEADERS_VERSION.tar.xz
+cd linux-$LINUX_HEADERS_VERSION
+make ARCH=arm64 INSTALL_HDR_PATH=/usr/local/aarch64-linux-gnu headers_install
+
+echo "Install GCC for aarch64-linux-gnu"
+
+cd /root
+
+mkdir gcc_build_aarch64 && cd gcc_build_aarch64
+../gcc/configure --target=aarch64-linux-gnu --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install glibc for aarch64-linux-gnu"
+
+cd /root
+
+GLIBC_FILE=glibc-$GLIBC_VERSION.tar.xz
+
+curl -L -O https://gnuftp.uib.no/glibc/$GLIBC_FILE
+
+GLIBC_FILE_SHA256="$(sha256sum $GLIBC_FILE | awk '{ print $1 }')"
+
+if [ $GLIBC_FILE_SHA256 != $GLIBC_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $GLIBC_FILE - expected $GLIBC_SHA256, got $GLIBC_FILE_SHA256"
+    exit 1
+fi
+
+tar xf $GLIBC_FILE
+
+mkdir glibc_build_aarch64 && cd glibc_build_aarch64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=aarch64-linux-gnu --target=aarch64-linux-gnu --prefix=/usr/local/aarch64-linux-gnu --with-headers=/usr/local/aarch64-linux-gnu/include --disable-multilib --disable-sanity-checks libc_cv_forced_unwind=yes
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/aarch64-linux-gnu/lib
+
+aarch64-linux-gnu-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/aarch64-linux-gnu/lib/libc.so
+
+touch /usr/local/aarch64-linux-gnu/include/gnu/stubs.h
+
+cd /root/gcc_build_aarch64
+make -j$(nproc) all-target-libgcc
+make install-target-libgcc
+
+cd /root/glibc_build_aarch64
+make -j$(nproc)
+make install
+
+echo "Finish installing GCC for aarch64-linux-gnu"
+
+cd /root/gcc_build_aarch64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Install binutils for riscv64-linux-gnu"
+
+cd /root/binutils-gdb-riscv64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=riscv64-linux-gnu
+make -j$(nproc)
+make install
+
+echo "Install Linux headers for riscv64-linux-gnu"
+
+cd /root/linux-$LINUX_HEADERS_VERSION
+make ARCH=riscv INSTALL_HDR_PATH=/usr/local/riscv64-linux-gnu headers_install
+
+echo "Install GCC for riscv64-linux-gnu"
+
+cd /root
+
+mkdir gcc_build_riscv64 && cd gcc_build_riscv64
+../gcc/configure --target=riscv64-linux-gnu --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install glibc for riscv64-linux-gnu"
+
+cd /root
+
+mkdir glibc_build_riscv64 && cd glibc_build_riscv64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=riscv64-linux-gnu --target=riscv64-linux-gnu --prefix=/usr/local/riscv64-linux-gnu --with-headers=/usr/local/riscv64-linux-gnu/include --disable-multilib --disable-sanity-checks libc_cv_forced_unwind=yes
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/riscv64-linux-gnu/lib
+
+riscv64-linux-gnu-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/riscv64-linux-gnu/lib/libc.so
+
+touch /usr/local/riscv64-linux-gnu/include/gnu/stubs.h
+
+cd /root/gcc_build_riscv64
+make -j$(nproc) all-target-libgcc
+make install-target-libgcc
+
+cd /root/glibc_build_riscv64
+make -j$(nproc)
+make install
+
+echo "Finish installing GCC for riscv64-linux-gnu"
+
+cd /root/gcc_build_riscv64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Add lib path for lld"
+
+ln -s /usr/local/riscv64-linux-gnu/lib /usr/local/riscv64-linux-gnu/lib64
+
+echo "Install binutils for x86_64-w64-mingw32"
+
+cd /root/binutils-gdb-w64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=x86_64-w64-mingw32
+make -j$(nproc)
+make install
+
+echo "Install mingw-w64 headers"
+
+cd /root
+
+git clone --depth=1 --branch v$MINGW_VERSION https://git.code.sf.net/p/mingw-w64/mingw-w64 mingw-w64-v$MINGW_VERSION
+rm -rf mingw-w64-v$MINGW_VERSION/.git
+
+cd mingw-w64-v$MINGW_VERSION/mingw-w64-headers
+CFLAGS='-O2' ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/x86_64-w64-mingw32
+make install
+
+echo "Install GCC for x86_64-w64-mingw32"
+
+cd /root
+
+mkdir gcc_build_w64 && cd gcc_build_w64
+../gcc/configure --target=x86_64-w64-mingw32 --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install mingw-w64 CRT"
+
+cd /root/mingw-w64-v$MINGW_VERSION
+CFLAGS='-O2' ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/x86_64-w64-mingw32 --with-libraries=winpthreads
+make
+make install
+
+echo "Finish installing GCC for x86_64-w64-mingw32"
+
+cd /root/gcc_build_w64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Install glibc for x86_64-pc-linux-gnu"
+
+cd /root
+
+mkdir glibc_build_x86_64 && cd glibc_build_x86_64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=x86_64-pc-linux-gnu --target=x86_64-pc-linux-gnu --prefix=/usr/local/x86_64-pc-linux-gnu --disable-multilib
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+
+mkdir /usr/local/x86_64-pc-linux-gnu/lib
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/x86_64-pc-linux-gnu/lib
+
+gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/x86_64-pc-linux-gnu/lib/libc.so
+
+cd /root/glibc_build_x86_64
+make -j$(nproc)
+make install
+
+echo "Delete system glibc files to force our glibc"
+
+rm /usr/lib/x86_64-linux-gnu/crt1.o
+rm /usr/lib/x86_64-linux-gnu/crti.o
+rm /usr/lib/x86_64-linux-gnu/crtn.o
+rm /usr/lib/x86_64-linux-gnu/libc.a
diff --git a/release_scripts/linux_aarch64/p2pool_linux_aarch64.sh b/release_scripts/linux_aarch64/p2pool_linux_aarch64.sh
index 824a1e8..fb7cd2b 100755
--- a/release_scripts/linux_aarch64/p2pool_linux_aarch64.sh
+++ b/release_scripts/linux_aarch64/p2pool_linux_aarch64.sh
@@ -31,7 +31,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=aarch64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=aarch64
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/release_scripts/linux_riscv64/p2pool_linux_riscv64.sh b/release_scripts/linux_riscv64/p2pool_linux_riscv64.sh
index b75f060..fef70a8 100755
--- a/release_scripts/linux_riscv64/p2pool_linux_riscv64.sh
+++ b/release_scripts/linux_riscv64/p2pool_linux_riscv64.sh
@@ -31,7 +31,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=riscv64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=riscv64
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/release_scripts/linux_x64/p2pool_linux_x64.sh b/release_scripts/linux_x64/p2pool_linux_x64.sh
index 2dfc442..0c830d0 100755
--- a/release_scripts/linux_x64/p2pool_linux_x64.sh
+++ b/release_scripts/linux_x64/p2pool_linux_x64.sh
@@ -13,25 +13,25 @@ flags_libs="-Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
 flags_p2pool="-fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang-20 -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
 make -j$(nproc)
 cd lib && cp -f libcurl.a .libs
 
 cd /p2pool/external/src/libuv
 rm -rf build
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang-20 -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
 make -j$(nproc)
 
 cd /p2pool/external/src/libzmq
 rm -rf build
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
 make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DSTATIC_BINARY=ON -DARCH_ID=x86_64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DSTATIC_BINARY=ON -DARCH_ID=x86_64
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/release_scripts/windows_x64/Dockerfile b/release_scripts/windows_x64/Dockerfile
index 5be74fc..8773ac7 100644
--- a/release_scripts/windows_x64/Dockerfile
+++ b/release_scripts/windows_x64/Dockerfile
@@ -1,4 +1,4 @@
 FROM p2pool_build_ubuntu
 ARG P2POOL_VERSION BUILD_TIMESTAMP
-ADD p2pool.tar p2pool_windows_x64.sh intrin-impl.patch /p2pool/
+ADD p2pool.tar p2pool_windows_x64.sh /p2pool/
 RUN /p2pool/p2pool_windows_x64.sh p2pool-${P2POOL_VERSION}-windows-x64 ${BUILD_TIMESTAMP}
diff --git a/release_scripts/windows_x64/intrin-impl.patch b/release_scripts/windows_x64/intrin-impl.patch
deleted file mode 100644
index bbf33f2..0000000
--- a/release_scripts/windows_x64/intrin-impl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- intrin-impl.h
-+++ intrin-impl.h
-@@ -2023,7 +2023,7 @@
- #define __INTRINSIC_DEFINED___cpuid
- #endif /* __INTRINSIC_PROLOG */
- 
--#if (!defined(__GNUC__) || __GNUC__ < 11)
-+#if !defined(__clang__) && (!defined(__GNUC__) || __GNUC__ < 11)
- #if __INTRINSIC_PROLOG(__cpuidex)
- void __cpuidex(int CPUInfo[4], int, int);
- #if !__has_builtin(__cpuidex)
diff --git a/release_scripts/windows_x64/p2pool_windows_x64.sh b/release_scripts/windows_x64/p2pool_windows_x64.sh
index 6502367..63599af 100755
--- a/release_scripts/windows_x64/p2pool_windows_x64.sh
+++ b/release_scripts/windows_x64/p2pool_windows_x64.sh
@@ -6,14 +6,13 @@ CURRENT_DATE=$(date -u -d @$2 +"%Y-%m-%d")
 CURRENT_TIME=$(date -u -d @$2 +"%H:%M:%S")
 TOUCH_DATE=$(date -u -d @$2 +"%Y%m%d%H%M.%S")
 
-cd /p2pool
-cp /usr/x86_64-w64-mingw32/include/psdk_inc/intrin-impl.h intrin-impl.h
-patch -u intrin-impl.h -i intrin-impl.patch
-cp -f intrin-impl.h /usr/x86_64-w64-mingw32/include/psdk_inc/intrin-impl.h
-rm intrin-impl.h
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
 
-flags_libs="--target=x86_64-pc-windows-gnu -Os -flto -ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections -Wl,/timestamp:$2 -fuse-ld=lld -w"
-flags_p2pool="--target=x86_64-pc-windows-gnu -ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections -Wl,/timestamp:$2 -fuse-ld=lld -femulated-tls -Wno-unused-command-line-argument"
+flags_libs="--target=x86_64-pc-windows-gnu -Os -flto -Wl,/timestamp:$2 -fuse-ld=lld -w $flags_size $flags_datetime"
+
+flags_p2pool="--target=x86_64-pc-windows-gnu -Wl,/timestamp:$2 -fuse-ld=lld -femulated-tls -Wno-unused-command-line-argument $flags_size $flags_datetime"
+flags_cxx_headers="-isystem /usr/local/x86_64-w64-mingw32/include/c++ -isystem /usr/local/x86_64-w64-mingw32/include/c++/15.1.0 -isystem /usr/local/x86_64-w64-mingw32/include"
 
 cd /p2pool/external/src/curl
 cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
@@ -34,7 +33,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=x86_64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool $flags_cxx_headers" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=x86_64
 make -j$(nproc) p2pool
 
 mkdir $1