Skip to content

Commit 5aa15ff

Browse files
authored
Use libgcc dlls from build system compiler (#22197)
instead of opensuse
1 parent e9b73ec commit 5aa15ff

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ endif
461461

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

0 commit comments

Comments
 (0)