diff options
| author | bors <bors@rust-lang.org> | 2015-10-28 19:34:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-28 19:34:21 +0000 |
| commit | 65623dba0d0c39de0e7cc66a31bce45328c3caa8 (patch) | |
| tree | 621d579518d2e54ce56d9a0f106a341e852169b4 | |
| parent | e3f6a5606e4a0a99501eb9bfee20999f79a2975f (diff) | |
| parent | 98dcde183da298e33de21b71b732728e480b92f8 (diff) | |
Auto merge of #29403 - alexcrichton:fix-windows-again-zomg, r=brson
Although the compiler itself does not depend on this DLL the `libstdc++-6.dll` that we're shipping does, so we still need to include it.
| -rw-r--r-- | src/etc/make-win-dist.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/etc/make-win-dist.py b/src/etc/make-win-dist.py index d484316b4d9..1c289e71188 100644 --- a/src/etc/make-win-dist.py +++ b/src/etc/make-win-dist.py @@ -50,6 +50,8 @@ def make_win_dist(rust_root, gcc_root, target_triple): rustc_dlls = ["libstdc++-6.dll"] if target_triple.startswith("i686-"): rustc_dlls.append("libgcc_s_dw2-1.dll") + else: + rustc_dlls.append("libgcc_s_seh-1.dll") target_libs = [ # MinGW libs "crtbegin.o", |