diff options
| author | bors <bors@rust-lang.org> | 2015-10-26 04:48:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-26 04:48:00 +0000 |
| commit | 039b2ca74f481b8e6c8ebfc9ae12729442ac1021 (patch) | |
| tree | 7667f57759503337c0daaf45b12590e11e1bb615 | |
| parent | 908979d53d9261de7bb87708762c099fb069840c (diff) | |
| parent | d51b432fd7f75d25ad6bc63c7cbcffdeea4bd732 (diff) | |
| download | rust-039b2ca74f481b8e6c8ebfc9ae12729442ac1021.tar.gz rust-039b2ca74f481b8e6c8ebfc9ae12729442ac1021.zip | |
Auto merge of #29306 - alexcrichton:yet-another-windows-dist-fix, r=vadimcn
We don't need the support libgcc SEH library, but we do need the C++ standard library for running the compiler itself. cc #29208 Closes #29294
| -rw-r--r-- | mk/dist.mk | 4 | ||||
| -rw-r--r-- | src/etc/make-win-dist.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 55c45d2c544..4cdee8bda9d 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -150,11 +150,11 @@ prepare-overlay-$(1): dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)-host prepare-overlay-$(1) @$(call E, build: $$@) -# On a 32-bit MinGW target we've got a few runtime DLL dependencies that we need +# On a MinGW target we've got a few runtime DLL dependencies that we need # to include. THe first argument to `make-win-dist` is where to put these DLLs # (the image we're creating) and the second argument is a junk directory to # ignore all the other MinGW stuff the script creates. -ifeq ($(1),i686-pc-windows-gnu) +ifeq ($$(findstring pc-windows-gnu,$(1)),pc-windows-gnu) $$(Q)rm -Rf tmp/dist/win-rust-gcc-$(1) $$(Q)$$(CFG_PYTHON) $$(S)src/etc/make-win-dist.py \ tmp/dist/$$(PKG_NAME)-$(1)-image \ diff --git a/src/etc/make-win-dist.py b/src/etc/make-win-dist.py index 1c289e71188..d484316b4d9 100644 --- a/src/etc/make-win-dist.py +++ b/src/etc/make-win-dist.py @@ -50,8 +50,6 @@ 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", |