Skip to content

Commit

Permalink
Partially revert 0a629d5
Browse files Browse the repository at this point in the history
don't get gcc dll's from opensuse, this will hopefully fix llvm-config on appveyor
but may break zmq and ijulia on win64 nightlies

need to figure out how to get mingw gcc itself from opensuse to fix this
long-term
  • Loading branch information
tkelman committed Jun 13, 2015
1 parent b37323c commit 997c8d8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ ifeq ($(OS), WINNT)
-rm -f $(DESTDIR)$(private_libdir)/sys.$(SHLIB_EXT)

[ ! -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" >> "$(DESTDIR)$(prefix)/Git/etc/gitconfig" && \
Expand Down Expand Up @@ -537,15 +537,15 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z920.exe && \
7z x -y 7z920.exe 7z.exe 7z.dll && \
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \
"mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1"
"mingw32-libexpat1 mingw32-zlib1"
else ifeq ($(ARCH),x86_64)
cd dist-extras && \
$(JLDOWNLOAD) 7z920-x64.msi http://downloads.sourceforge.net/sevenzip/7z920-x64.msi && \
7z x -y 7z920-x64.msi _7z.exe _7z.dll && \
mv _7z.dll 7z.dll && \
mv _7z.exe 7z.exe && \
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \
"mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1"
"mingw64-libexpat1 mingw64-zlib1"
else
$(error no win-extras target for ARCH=$(ARCH))
endif
Expand Down

0 comments on commit 997c8d8

Please sign in to comment.