Skip to content

Commit b37fd3d

Browse files
authored
Rollup merge of rust-lang#41571 - alexcrichton:fix-windows-mingw, r=brson
windows: Copy libwinpthread-1.dll into libdir bin Recently we switched from the win32 MinGW toolchain to the pthreads-based toolchain. We ship `gcc.exe` from this toolchain with the `rust-mingw` package in the standard distribution but the pthreads version of `gcc.exe` depends on `libwinpthread-1.dll`. While we're shipping this DLL for the compiler to depend on we're not shipping it for gcc. As a workaround just copy the dll to gcc.exe location and don't attempt to share for now. cc rust-lang#31840 (comment)
2 parents 31c3c0c + 929124f commit b37fd3d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/etc/make-win-dist.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ def make_win_dist(rust_root, plat_root, target_triple):
4949
elif key == "libraries":
5050
lib_path.extend(val.lstrip(' =').split(';'))
5151

52-
target_tools = ["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe"]
52+
target_tools = ["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe",
53+
"libwinpthread-1.dll"]
5354

5455
rustc_dlls = ["libstdc++-6.dll", "libwinpthread-1.dll"]
5556
if target_triple.startswith("i686-"):

0 commit comments

Comments
 (0)