Skip to content

MinGW DLL improvements #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slipher wants to merge 3 commits into
base: master
Choose a base branch
from
+48 −38
Open

MinGW DLL improvements #44

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae8904e
Remove duplicated mingw variables block
slipher Jun 8, 2026
4d14357
Use GCC --print-file-name to locate MinGW DLLs
slipher Jun 8, 2026
a76ab30
MinGW: add libssp-0.dll only if needed
slipher Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 48 additions & 38 deletions build-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set -e
# error on undefined variable
set -u

# TODO: use a signal so this can actually exit from subshells?
throwError () {
local error_keyword="${1}"
local error_message="${2}"
Expand Down Expand Up @@ -161,18 +162,31 @@ dumpSymbols () {
}

findDll () {
local mingw_arch="${1}"
local dll_name="${2}"
local mingw_compiler="${1}"
local dll="${2}"

if [ -z "${mingw_arch}" ]
# On Debian, --print-file-name works on DLLs. They live in multiple directories.
dll_path=$("${mingw_compiler}" --print-file-name "${dll}")
if [ -e "${dll_path}" ]
then
find "${MINGW_PREFIX}/bin/${dll_name}"
echo "${dll_path}"
return
fi

# HACK: sort to get posix flavor of libstdc++ before win32 flavor
find '/usr' -name "${dll_name}" -type f | sort | grep --max-count=1 "${mingw_arch}" \
|| throwError INTERNAL "couldn't find DLL ${dll_name}"
local test_dll=libstdc++-6.dll
local test_importlib=libstdc++.dll.a

# On MSYS, Arch or Fedora there are bin and lib sibling directories.
# *.dll is in bin and *.dll.a is in lib. All DLLs are in one place.
importlib_path=$("${mingw_compiler}" --print-file-name "${test_importlib}")
dll_path=$(echo "${importlib_path}" | sed -e "s!/lib/${test_importlib}\$!/bin!")
if [ -e "${dll_path}/${test_dll}" ]
then
echo "${dll_path}/${dll}"
return
fi

throwError INTERNAL "Can't find DLL path for compiler '${mingw_compiler}'"
}

cleanSymbols () {
Expand Down Expand Up @@ -500,7 +514,8 @@ build () {
fi

strip="${mingw_arch_prefix}-w64-mingw32-strip"
cmake_opts="${cmake_opts} -DCMAKE_TOOLCHAIN_FILE=${daemon_dir}/cmake/cross-toolchain-mingw${bitness}.cmake"
# The -DCMAKE_C_COMPILER= hack makes this variable be cached
cmake_opts="${cmake_opts} -DCMAKE_C_COMPILER= -DCMAKE_TOOLCHAIN_FILE=${daemon_dir}/cmake/cross-toolchain-mingw${bitness}.cmake"
# unused
# cmake_opts="${cmake_opts} -DPKG_CONFIG_EXECUTABLE=${mingw_arch_prefix}-w64-mingw32-pkg-config"
fi
Expand Down Expand Up @@ -549,39 +564,9 @@ build () {
special_dll='libgcc_s_seh-1.dll'
fi

extra_dll_list="${special_dll} libgomp-1.dll libstdc++-6.dll libwinpthread-1.dll libssp-0.dll"
# DLLs are added to engine_file_list after building
engine_file_list="${engine_file_list} daemon.exe daemonded.exe daemon-tty.exe crash_server.exe nacl_loader.exe"
engine_symbolize_list='daemon.exe daemonded.exe daemon-tty.exe'
engine_strip_list='daemon.exe daemonded.exe daemon-tty.exe crash_server.exe'

# those paths are distro-centric
# cp -av "/usr/${mingw_arch_prefix}-w64-mingw32/lib/libwinpthread-1.dll" "${target_build_dir}/"
# cp -av "/usr/lib/gcc/${mingw_arch_prefix}-w64-mingw32/7.3-posix/libstdc++-6.dll" "${target_build_dir}/"
# cp -av "/usr/lib/gcc/${mingw_arch_prefix}-w64-mingw32/7.3-posix/${special_dll}" "${target_build_dir}/"
for dll_name in ${extra_dll_list}
do
dll_location="$(findDll "${mingw_arch_prefix}" "${dll_name}")"
cp -av "${dll_location}" "${target_build_dir}/"
done
fi

local strip='strip'
if "${system_windows}" && ! "${host_windows}"
then
if "${arch_i686}"
then
bitness='32'
mingw_arch_prefix='i686'
else
bitness='64'
mingw_arch_prefix='x86_64'
fi

strip="${mingw_arch_prefix}-w64-mingw32-strip"
cmake_opts="${cmake_opts} -DCMAKE_TOOLCHAIN_FILE=${daemon_dir}/cmake/cross-toolchain-mingw${bitness}.cmake"
# unused
# cmake_opts="${cmake_opts} -DPKG_CONFIG_EXECUTABLE=${mingw_arch_prefix}-w64-mingw32-pkg-config"
fi
fi

Expand All @@ -608,6 +593,25 @@ build () {
-D"CMAKE_EXE_LINKER_FLAGS=${cmake_cflags}" \
${cmake_opts} \
|| throwError INTERNAL "${target} cmake failed"

if "${system_windows}"
then
extra_dll_list="${special_dll} libgomp-1.dll libstdc++-6.dll libwinpthread-1.dll"
# DLLs are added to engine_file_list after building

local mingw_c_compiler=$(grep '^CMAKE_C_COMPILER:' "${target_build_dir}/CMakeCache.txt" \
| sed -E 's/^[^=]*=//')

for dll_name in ${extra_dll_list}
do
dll_location=$(findDll "${mingw_c_compiler}" "${dll_name}")
cp -av "${dll_location}" "${target_build_dir}/"
done

# Tool, which will help us later
mingw_objdump=$("${mingw_c_compiler}" --print-prog-name objdump)
"${mingw_objdump}" --help > /dev/null
fi
fi

if "${build_vm}"
Expand All @@ -627,6 +631,12 @@ build () {

if "${system_windows}"
then
# Newer MinGW toolchains don't emit libssp dependencies
if "${mingw_objdump}" -p "${target_build_dir}/daemon.exe" | grep libssp-0.dll
then
dll_location=$(findDll "${mingw_c_compiler}" libssp-0.dll)
cp -av "${dll_location}" "${target_build_dir}/"
fi
engine_file_list="${engine_file_list} $(cd "${target_build_dir}" && ls *.dll)"
elif "${system_macos}"
then
Expand Down