Skip to content

Commit 73b5504

Browse files
committed
Use libgcc dlls from build system compiler (#22197)
instead of opensuse (cherry picked from commit 5aa15ff)
1 parent 917f80e commit 73b5504

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ endif
460460

461461
ifeq ($(OS), WINNT)
462462
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
463-
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 libwinpthread-1.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
463+
cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
464464
ifeq ($(USE_GPL_LIBS), 1)
465465
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
466466
cp busybox.exe $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
@@ -591,7 +591,7 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
591591
$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \
592592
7z x -y 7z920.exe 7z.exe 7z.dll && \
593593
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_Leap_42.2 \
594-
"mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libwinpthread1 mingw32-libexpat1 mingw32-zlib1" && \
594+
"mingw32-libexpat1 mingw32-zlib1" && \
595595
cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll .
596596
else ifeq ($(ARCH),x86_64)
597597
cd $(JULIAHOME)/dist-extras && \
@@ -600,7 +600,7 @@ else ifeq ($(ARCH),x86_64)
600600
mv _7z.dll 7z.dll && \
601601
mv _7z.exe 7z.exe && \
602602
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_Leap_42.2 \
603-
"mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libwinpthread1 mingw64-libexpat1 mingw64-zlib1" && \
603+
"mingw64-libexpat1 mingw64-zlib1" && \
604604
cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
605605
else
606606
$(error no win-extras target for ARCH=$(ARCH))

0 commit comments

Comments
 (0)