cleanup some windows errata

Make.inc

@@ -58,7 +58,7 @@ endif
 
 ifeq ($(OS), WINNT)
 fPIC = 
-PATH := ${PATH}:${BUILD}/lib:${BUILD}/lib/julia
+PATH := ${PATH}:${BUILD}/lib:${BUILD}/lib/julia:/c/Program Files/7-zip
 EXE = .exe
 else
 fPIC = -fPIC

Makefile

@@ -217,7 +217,7 @@ endif
  7z e -y mingw-libexpat.cpio && \
  7z x -y mingw-zlib.rpm -so > mingw-zlib.cpio && \
  7z e -y mingw-zlib.cpio && \
- wget -O PortableGit.7z https:https://msysgit.googlecode.com/files/PortableGit-1.8.3-preview20130601.7z
+ wget -O PortableGit.7z http:https://msysgit.googlecode.com/files/PortableGit-1.8.3-preview20130601.7z
 
 wine_path:
  $(info $(WINE_PATH))

README.windows.md

@@ -38,11 +38,7 @@ There are a few environments you can use to build julia. Making this easy requir
 Important Build Errata
 ----------------------
 
-- Do not use GCC 4.6 or earlier
-
-- LLVM doesn't build with the newly released 4.8 SEH gcc for 64-bit Windows because of an incorrect preprocessor definition. In deps/llvm-3.2/lib/ExecutionEngine/JIT/JIT.cpp, find the section that defines HAVE_EHTABLE_SUPPORT and replace it with an unconditional 0
-
-- While building on native windows, MPFR tests fail. To fix this, edit deps/Makefile and add `MPFR_OPTS += --disable-thread-safe CFLAGS="-DNPRINTF_L -DNPRINTF_T -DNPRINTF_J"` somewhere
+- Do not use GCC 4.6 or earlier or gcc-dw2, stuff will be broken
 
 
 Native Compile

deps/Makefile

@@ -107,6 +107,11 @@ ifeq ($(USE_SYSTEM_GMP), 0)
 MPFR_OPTS = --with-gmp=$(abspath $(BUILD))
 endif
 endif
+ifeq ($(BUILD_OS),WINNT)
+ifeq ($(OS),WINNT)
+MPFR_OPTS += --disable-thread-safe CFLAGS="-DNPRINTF_L -DNPRINTF_T -DNPRINTF_J"
+endif
+endif
 
 ifeq ($(USE_SYSTEM_ARPACK), 0)
 STAGE2_DEPS += arpack
@@ -202,7 +207,7 @@ else
 LLVM_FLAGS += --disable-assertions --enable-optimized
 endif
 ifeq ($(OS), WINNT)
-LLVM_FLAGS += --with-extra-ld-options="-Wl,--stack,8388608" LDFLAGS="" --disable-shared
+LLVM_FLAGS += --with-extra-ld-options="-Wl,--stack,8388608" LDFLAGS="" --disable-shared CPPFLAGS="-D__USING_SJLJ_EXCEPTIONS__"
 endif
 
 ifeq ($(BUILD_LLDB),1)

src/dlload.c

@@ -116,10 +116,10 @@ static uv_lib_t *jl_load_dynamic_library_(char *modname, unsigned flags, int thr
  ext = extensions[i];
  path[0] = '\0';
  handle->handle = NULL;
- if (dl_path[len-1] == '/')
+ if (dl_path[len-1] == PATHSEP)
  snprintf(path, PATHBUF, "%s%s%s", dl_path, modname, ext);
  else
- snprintf(path, PATHBUF, "%s/%s%s", dl_path, modname, ext);
+ snprintf(path, PATHBUF, "%s" PATHSEPSTRING "%s%s", dl_path, modname, ext);
  error = jl_uv_dlopen(path, handle, flags);
  if (!error) goto done;
  }