Skip to content

Commit e4bd799

Browse files
committed
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 c1e565c) ref #15285
1 parent 93e38d8 commit e4bd799

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ endif
438438

439439
ifeq ($(OS), WINNT)
440440
[ ! -d dist-extras ] || ( cd dist-extras && \
441-
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) && \
441+
cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(bindir) && \
442442
mkdir $(DESTDIR)$(prefix)/Git && \
443443
7z x PortableGit.7z -o"$(DESTDIR)$(prefix)/Git" && \
444444
echo "[core] eol = lf" >> "$(GITCONFIG)" && \

contrib/windows/msys_build.sh

+6
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ rm -f usr/bin/libjulia.dll
105105
rm -f usr/bin/libjulia-debug.dll
106106

107107
if [ -z "$USEMSVC" ]; then
108+
rm -f usr/bin/libgcc_s_s*-1.dll
109+
rm -f usr/bin/libgfortran-3.dll
110+
rm -f usr/bin/libquadmath-0.dll
111+
rm -f usr/bin/libssp-0.dll
112+
rm -f usr/bin/libstdc++-6.dll
113+
108114
if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then
109115
f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z
110116
checksum_download \

0 commit comments

Comments
 (0)