Skip to content

Commit 19b4222

Browse files
committed
Reinstate downloading old versions of winrpm gcc dll's
This mostly reverts #17906 and puts #15521 back in place, but from a slightly more permanent download location now. Unfortunately using the latest opensuse copy of the gcc dll's is causing issues when a cygwin-built Julia tries to load an opensuse-built libzmq.dll. Using these slightly old gcc 5 versions seems to fix it. I suspect the difference is which libstdc++ ABI is being used. GCC 5 has both old and new available, but many distros had it using the old ABI by default for compatibility. GCC 6 (which opensuse is using now) is more likely to be using the new ABI by default. (cherry picked from commit 477a026) ref #18059
1 parent b9d7579 commit 19b4222

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

Makefile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ endif
468468

469469
ifeq ($(OS), WINNT)
470470
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
471-
cp 7z.exe 7z.dll busybox.exe libexpat-1.dll zlib1.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
471+
cp 7z.exe 7z.dll busybox.exe libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
472472
cd $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
473473

474474
# create file listing for uninstall. note: must have Windows path separators and line endings.
@@ -593,7 +593,14 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
593593
$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \
594594
7z x -y 7z920.exe 7z.exe 7z.dll && \
595595
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.2 \
596-
"mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1" && \
596+
"mingw32-libexpat1 mingw32-zlib1" && \
597+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw32-libgfortran3-5.3.0-1.1.noarch.rpm && \
598+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw32-libquadmath0-5.3.0-1.1.noarch.rpm && \
599+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw32-libstdc++6-5.3.0-1.1.noarch.rpm && \
600+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw32-libgcc_s_sjlj1-5.3.0-1.1.noarch.rpm && \
601+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw32-libssp0-5.3.0-1.1.noarch.rpm && \
602+
for i in *.rpm; do 7z x -y $$i; done && \
603+
for i in *.cpio; do 7z x -y $$i; done && \
597604
cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll .
598605
else ifeq ($(ARCH),x86_64)
599606
cd $(JULIAHOME)/dist-extras && \
@@ -602,7 +609,14 @@ else ifeq ($(ARCH),x86_64)
602609
mv _7z.dll 7z.dll && \
603610
mv _7z.exe 7z.exe && \
604611
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.2 \
605-
"mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1" && \
612+
"mingw64-libexpat1 mingw64-zlib1" && \
613+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw64-libgfortran3-5.3.0-1.1.noarch.rpm && \
614+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw64-libquadmath0-5.3.0-1.1.noarch.rpm && \
615+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw64-libstdc++6-5.3.0-1.1.noarch.rpm && \
616+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw64-libgcc_s_seh1-5.3.0-1.1.noarch.rpm && \
617+
$(JLDOWNLOAD) https://julialang.s3.amazonaws.com/bin/winnt/extras/mingw64-libssp0-5.3.0-1.1.noarch.rpm && \
618+
for i in *.rpm; do 7z x -y $$i; done && \
619+
for i in *.cpio; do 7z x -y $$i; done && \
606620
cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
607621
else
608622
$(error no win-extras target for ARCH=$(ARCH))

0 commit comments

Comments
 (0)