Skip to content

Commit

Permalink
Do not copy gcc dlls from dist-extras in windows binary-dist
Browse files Browse the repository at this point in the history
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 JuliaLang#15285
  • Loading branch information
tkelman committed Mar 13, 2016
1 parent 93e38d8 commit e4bd799
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)" && \
Expand Down
6 changes: 6 additions & 0 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit e4bd799

Please sign in to comment.