Fix #10865, Windows julia segfaulting without sys.dll

also test this on appveyor
JuliaLang · Apr 18, 2015 · 52f0cf6 · 52f0cf6
1 parent c384fce
commit 52f0cf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -50,4 +50,5 @@ build_script:
 
 test_script:
   - usr\bin\julia -e "versioninfo()"
+  - copy usr\lib\julia\sys.ji local.ji && usr\bin\julia -J local.ji -e "true" && del local.ji
   - cd test && ..\usr\bin\julia runtests.jl all
diff --git a/src/dlload.c b/src/dlload.c
@@ -120,10 +120,12 @@ static uv_lib_t *jl_load_dynamic_library_(const char *modname, unsigned flags, i
                         snprintf(path, PATHBUF, "%s%s%s", dl_path, modname, ext);
                     else
                         snprintf(path, PATHBUF, "%s" PATHSEPSTRING "%s%s", dl_path, modname, ext);
+#ifndef _OS_WINDOWS_
                     if (handle->errmsg) {
                         free(handle->errmsg);
                         handle->errmsg = NULL;
                     }
+#endif
                     error = jl_uv_dlopen(path, handle, flags);
                     if (!error) goto done;
                 }
@@ -136,10 +138,12 @@ static uv_lib_t *jl_load_dynamic_library_(const char *modname, unsigned flags, i
         handle->handle = NULL;
         /* try loading from standard library path */
         snprintf(path, PATHBUF, "%s%s", modname, ext);
+#ifndef _OS_WINDOWS_
         if (handle->errmsg) {
             free(handle->errmsg);
             handle->errmsg = NULL;
         }
+#endif
         error = jl_uv_dlopen(path, handle, flags);
         if (!error) goto done;
     }