diff options
| author | bors <bors@rust-lang.org> | 2017-04-06 03:42:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-06 03:42:31 +0000 |
| commit | 1a9b382168cbf405589fbba7215ace700c067879 (patch) | |
| tree | ecaaf285c2c836cbfabfd40a82fcbd993f5c111f /src/etc | |
| parent | 6cd15a0e8fecce04fd99b77b25099bf374bb0f56 (diff) | |
| parent | ad3f6e056cdae847c3784ece2ebd8b52baa130e2 (diff) | |
Auto merge of #40805 - vadimcn:msys-mingw, r=alexcrichton
[Windows] Enable building rustc with "pthreads" flavor of mingw. Tested on mingw-w64 packaged with msys2. r? @alexcrichton cc #40123
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/make-win-dist.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/make-win-dist.py b/src/etc/make-win-dist.py index eda5f854085..394ff97d845 100644 --- a/src/etc/make-win-dist.py +++ b/src/etc/make-win-dist.py @@ -51,7 +51,7 @@ def make_win_dist(rust_root, plat_root, target_triple): target_tools = ["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe"] - rustc_dlls = ["libstdc++-6.dll"] + rustc_dlls = ["libstdc++-6.dll", "libwinpthread-1.dll"] if target_triple.startswith("i686-"): rustc_dlls.append("libgcc_s_dw2-1.dll") else: @@ -67,6 +67,7 @@ def make_win_dist(rust_root, plat_root, target_triple): "libstdc++.a", "libiconv.a", "libmoldname.a", + "libpthread.a", # Windows import libs "libadvapi32.a", "libbcrypt.a", |