diff --git a/cmake/git.cmake b/cmake/git.cmake
index 668e610..435634e 100644
--- a/cmake/git.cmake
+++ b/cmake/git.cmake
@@ -1,29 +1,33 @@
-set(GIT_COMMIT "unknown")
+if (GIT_COMMIT)
+	message(STATUS "GIT_COMMIT is set to ${GIT_COMMIT}")
+else()
+	set(GIT_COMMIT "unknown")
 
-find_program(GIT_EXECUTABLE git)
+	find_program(GIT_EXECUTABLE git)
 
-if (GIT_EXECUTABLE)
-	execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=7 HEAD
-		WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-		RESULT_VARIABLE RET
-		OUTPUT_VARIABLE COMMIT
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-	if (RET EQUAL 0)
-		set(GIT_COMMIT "${COMMIT}")
-
-		execute_process(COMMAND git status --porcelain
+	if (GIT_EXECUTABLE)
+		execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=7 HEAD
 			WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 			RESULT_VARIABLE RET
-			OUTPUT_VARIABLE GIT_UNSTAGED
+			OUTPUT_VARIABLE COMMIT
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-		if(GIT_UNSTAGED OR RET)
-			set(GIT_COMMIT "${GIT_COMMIT} (dirty)")
+		if (RET EQUAL 0)
+			set(GIT_COMMIT "${COMMIT}")
+
+			execute_process(COMMAND git status --porcelain
+				WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+				RESULT_VARIABLE RET
+				OUTPUT_VARIABLE GIT_UNSTAGED
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+			if(GIT_UNSTAGED OR RET)
+				set(GIT_COMMIT "${GIT_COMMIT} (dirty)")
+			endif()
 		endif()
 	endif()
+
+	message(STATUS "You are currently on commit ${GIT_COMMIT}")
 endif()
 
-message(STATUS "You are currently on commit ${GIT_COMMIT}")
-
 add_compile_definitions(GIT_COMMIT="${GIT_COMMIT}")
diff --git a/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh b/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
index a133b52..3e10a5d 100755
--- a/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
+++ b/scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/freebsd_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/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=aarch64 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh b/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
index 6939915..2b0d383 100755
--- a/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
+++ b/scripts/release/freebsd_x64/p2pool_freebsd_x64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/freebsd_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/freebsd_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 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh b/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
index 0ef88c3..dfe36ad 100755
--- a/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
+++ b/scripts/release/linux_aarch64/p2pool_linux_aarch64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-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
+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 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh b/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
index 6bd20e2..9328295 100755
--- a/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
+++ b/scripts/release/linux_riscv64/p2pool_linux_riscv64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-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
+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 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/linux_x64/p2pool_linux_x64.sh b/scripts/release/linux_x64/p2pool_linux_x64.sh
index ab85b7a..bf5ba48 100755
--- a/scripts/release/linux_x64/p2pool_linux_x64.sh
+++ b/scripts/release/linux_x64/p2pool_linux_x64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-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
+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 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
index b3d6ade..2286a3b 100755
--- a/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
+++ b/scripts/release/macos_aarch64/p2pool_macos_aarch64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=aarch64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=aarch64 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/macos_x64/p2pool_macos_x64.sh b/scripts/release/macos_x64/p2pool_macos_x64.sh
index 84ed9c1..4aa8092 100755
--- a/scripts/release/macos_x64/p2pool_macos_x64.sh
+++ b/scripts/release/macos_x64/p2pool_macos_x64.sh
@@ -38,7 +38,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=x86_64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=x86_64 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
diff --git a/scripts/release/windows_x64/p2pool_windows_x64.sh b/scripts/release/windows_x64/p2pool_windows_x64.sh
index 8191dd6..3756627 100755
--- a/scripts/release/windows_x64/p2pool_windows_x64.sh
+++ b/scripts/release/windows_x64/p2pool_windows_x64.sh
@@ -43,7 +43,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-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
+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 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1