From e4bd7997af27291e52e794fc0b83dea73516b7a3 Mon Sep 17 00:00:00 2001
From: Tony Kelman <tony@kelman.net>
Date: Mon, 29 Feb 2016 02:23:25 -0800
Subject: [PATCH] Do not copy gcc dlls from dist-extras in windows binary-dist

Use versions from the build system rather than win-extras (which downloads
from opensuse)

Remove gcc dlls from downloaded nightly on appveyor

(cherry picked from commit c1e565c714da498a696dc5e94fd9b5f69c1968c1)
ref #15285
---
 Makefile                      | 2 +-
 contrib/windows/msys_build.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index abc545139af35..29d180bce8f74 100644
--- a/Makefile
+++ b/Makefile
@@ -438,7 +438,7 @@ endif
 
 ifeq ($(OS), WINNT)
 	[ ! -d dist-extras ] || ( cd dist-extras && \
-		cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(bindir) && \
+		cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(bindir) && \
 	    mkdir $(DESTDIR)$(prefix)/Git && \
 	    7z x PortableGit.7z -o"$(DESTDIR)$(prefix)/Git" && \
 	    echo "[core] eol = lf" >> "$(GITCONFIG)" && \
diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh
index 4feba26649c2e..896ce59a04c4b 100755
--- a/contrib/windows/msys_build.sh
+++ b/contrib/windows/msys_build.sh
@@ -105,6 +105,12 @@ rm -f usr/bin/libjulia.dll
 rm -f usr/bin/libjulia-debug.dll
 
 if [ -z "$USEMSVC" ]; then
+  rm -f usr/bin/libgcc_s_s*-1.dll
+  rm -f usr/bin/libgfortran-3.dll
+  rm -f usr/bin/libquadmath-0.dll
+  rm -f usr/bin/libssp-0.dll
+  rm -f usr/bin/libstdc++-6.dll
+
   if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then
     f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z
     checksum_download \