ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-31 08:25:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preserve each variant of libwinpthread.dll

Browse Source 
... in the corresponding /lib directory. Mingw-w64 installs it to /bin,
so multiple variants in a multilib configuration override each other.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-05-03 22:28:10 -07:00
parent d7eed4ee52
commit e1610ee7b6
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build/libc/mingw-w64.sh
View File

@ -161,11 +161,29 @@ do_mingw_pthreads()
CT_DoLog EXTRA "Installing mingw-w64-winpthreads"
CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR}
# Post-install hackery: all libwinpthread-1.dll end up being installed
# into /bin, which is broken on multilib install. Hence, stash it back
# into /lib - and after iterating over multilibs, copy the default one
# back into /bin.
if [ "${multi_index}" != 1 -o "${multi_count}" != 1 ]; then
CT_DoExecLog ALL mv "${CT_SYSROOT_DIR}${MINGW_INSTALL_PREFIX}/bin/libwinpthread-1.dll" \
"${CT_SYSROOT_DIR}${libprefix}/libwinpthread-1.dll"
if [ "${multi_index}" = 1 ]; then
default_libprefix="${libprefix}"
elif [ "${multi_index}" = "${multi_count}" ]; then
CT_DoExecLog ALL cp "${CT_SYSROOT_DIR}${default_libprefix}/libwinpthread-1.dll" \
"${CT_SYSROOT_DIR}${MINGW_INSTALL_PREFIX}/bin/libwinpthread-1.dll"
fi
fi
CT_EndStep
}
do_libc()
{
# Used when iterating over libwinpthread
local default_libprefix
do_check_mingw_vendor_tuple
CT_DoStep INFO "Building mingw-w64"