Hopefully fix the appveyor c++ ABI mess

appveyor.yml

@@ -31,8 +31,8 @@ init:
 
 cache:
 # Cache any downloads from sourceforge because it's really unreliable
- - toolchain-nofortran-i686-w64-mingw32.7z
- - toolchain-nofortran-x86_64-w64-mingw32.7z
+ - i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
+ - x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
  - llvm-3.3-i686-w64-mingw32-juliadeps.7z
  - llvm-3.3-x86_64-w64-mingw32-juliadeps.7z
  - jq.exe

contrib/windows/msys_build.sh

@@ -40,11 +40,13 @@ echo "" > get-deps.log
 if [ "$ARCH" = x86_64 ]; then
  bits=64
  archsuffix=64
+ exc=seh
  echo "override MARCH = x86-64" >> Make.user
  echo 'USE_BLAS64 = 1' >> Make.user
 else
  bits=32
  archsuffix=86
+ exc=sjlj
  echo "override MARCH = i686" >> Make.user
  echo "override JULIA_CPU_TARGET = pentium4" >> Make.user
 fi
@@ -101,16 +103,19 @@ mkdir -p usr/Git/tmp
 rm -f usr/bin/libjulia.dll
 rm -f usr/bin/libjulia-debug.dll
 
+mingw=http:https://sourceforge.net/projects/mingw
 if [ -z "$USEMSVC" ]; then
  if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then
- f=toolchain-nofortran-$ARCH-w64-mingw32.7z
+ f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z
  if ! [ -e $f ]; then
  echo "Downloading $f"
- $curlflags -O http:https://sourceforge.net/projects/juliadeps-win/files/$f
+ $curlflags -O $mingw-w64/files/Toolchains%20targetting%20Win$bits/Personal%20Builds/mingw-builds/4.9.2/threads-win32/$exc/$f
  fi
  echo "Extracting $f"
  $SEVENZIP x -y $f >> get-deps.log
- export PATH=$PATH:$PWD/usr/$ARCH-w64-mingw32/sys-root/mingw/bin
+ export PATH=$PATH:$PWD/mingw$bits/bin
+ # If there is a version of make.exe here, it is mingw32-make which won't work
+ rm -f mingw$bits/bin/make.exe
  fi
  export AR=${CROSS_COMPILE}ar
 
@@ -158,7 +163,7 @@ if [ -z "`which make 2>/dev/null`" ]; then
  f="/make/make-3.81-2/make-3.81-2-msys-1.0.11-bin.tar"
  if ! [ -e `basename $f.lzma` ]; then
  echo "Downloading `basename $f`"
- $curlflags -O http:https://sourceforge.net/projects/mingw/files/MSYS/Base$f.lzma
+ $curlflags -O $mingw/files/MSYS/Base$f.lzma
  fi
  $SEVENZIP x -y `basename $f.lzma` >> get-deps.log
  tar -xf `basename $f`