fix windows deps

Author: IanButterworth

stdlib/LibCURL_jll/src/LibCURL_jll.jl

@@ -7,7 +7,7 @@ using Base, Libdl, nghttp2_jll, LibSSH2_jll, Zlib_jll
 if !(Sys.iswindows() || Sys.isapple())
     using OpenSSL_jll
 end
-if Sys.iswindows()
+if Sys.iswindows() && Sys.WORD_SIZE == 32
     using CompilerSupportLibraries_jll
 end
 
@@ -32,7 +32,11 @@ const libcurl = LazyLibrary(
         error("LibCURL_jll: Library 'libcurl' is not available for $(Sys.KERNEL)")
     end;
     dependencies = if Sys.iswindows()
-        LazyLibrary[libz, libnghttp2, libssh2, libgcc_s]
+        if  Sys.WORD_SIZE == 32
+            LazyLibrary[libz, libnghttp2, libssh2, libgcc_s]
+        else
+            LazyLibrary[libz, libnghttp2, libssh2]
+        end
     elseif Sys.islinux() || Sys.isfreebsd()
         LazyLibrary[libz, libnghttp2, libssh2, libssl, libcrypto]
     elseif Sys.isapple()

stdlib/LibGit2_jll/src/LibGit2_jll.jl

@@ -7,7 +7,7 @@ using Base, Libdl, LibSSH2_jll
 if !(Sys.iswindows() || Sys.isapple())
     using OpenSSL_jll
 end
-if Sys.iswindows()
+if Sys.iswindows() && Sys.WORD_SIZE == 32
     using CompilerSupportLibraries_jll
 end
 
@@ -31,8 +31,12 @@ const libgit2 = LazyLibrary(
     else
         error("LibGit2_jll: Library 'libgit2' is not available for $(Sys.KERNEL)")
     end;
-    dependencies = if Sys.iswindows() && Sys.WORD_SIZE == 32
-        LazyLibrary[libssh2, libgcc_s]
+    dependencies = if Sys.iswindows()
+        if Sys.WORD_SIZE == 32
+            LazyLibrary[libssh2, libgcc_s]
+        else
+            LazyLibrary[libssh2]
+        end
     elseif Sys.isfreebsd() || Sys.islinux()
         LazyLibrary[libssh2, libssl, libcrypto]
     else

stdlib/LibSSH2_jll/src/LibSSH2_jll.jl

@@ -3,10 +3,14 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/LibSSH2_jll.jl
 
 baremodule LibSSH2_jll
-using Base, Libdl, Zlib_jll
-if Sys.iswindows()
+using Base, Libdl
+if Sys.isfreebsd() || Sys.isapple()
+    using Zlib_jll
+end
+if Sys.iswindows() && Sys.WORD_SIZE == 32
     using CompilerSupportLibraries_jll
-else
+end
+if !Sys.iswindows()
     using OpenSSL_jll
 end
 
@@ -31,7 +35,11 @@ const libssh2 = LazyLibrary(
         error("LibSSH2_jll: Library 'libssh2' is not available for $(Sys.KERNEL)")
     end;
     dependencies = if Sys.iswindows()
-        LazyLibrary[libgcc_s]
+        if Sys.WORD_SIZE == 32
+            LazyLibrary[libgcc_s]
+        else
+            LazyLibrary[]
+        end
     elseif Sys.islinux()
         LazyLibrary[libcrypto]
     elseif Sys.isfreebsd() || Sys.isapple()
@@ -40,7 +48,9 @@ const libssh2 = LazyLibrary(
 )
 
 function eager_mode()
-    Zlib_jll.eager_mode()
+    @static if @isdefined Zlib_jll
+        Zlib_jll.eager_mode()
+    end
     @static if @isdefined CompilerSupportLibraries_jll
         CompilerSupportLibraries_jll.eager_mode()
     end

stdlib/OpenLibm_jll/src/OpenLibm_jll.jl

@@ -26,7 +26,7 @@ const libopenlibm = LazyLibrary(
         BundledLazyLibraryPath("libopenlibm.so.4")
     end,
     dependencies = if Sys.iswindows()
-        LazyLibrary[CompilerSupportLibraries_jll.libgcc_s]
+        LazyLibrary[libgcc_s]
     else
         LazyLibrary[]
     end

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

@@ -4,7 +4,9 @@
 baremodule SuiteSparse_jll
 using Base, Libdl
 using libblastrampoline_jll
-using CompilerSupportLibraries_jll
+if !(Sys.isfreebsd() || Sys.isapple())
+    using CompilerSupportLibraries_jll
+end
 
 export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libldl, librbio, libspqr, libsuitesparseconfig, libumfpack
 
@@ -66,7 +68,7 @@ const libcolamd = LazyLibrary(
     else
         error("SuiteSparse_jll: Library 'libcolamd' is not available for $(Sys.KERNEL)")
     end;
-    dependencies = if Sys.iswindows()
+    dependencies = if Sys.iswindows() && Sys.WORD_SIZE == 32
         LazyLibrary[libsuitesparseconfig, libgcc_s]
     else
         LazyLibrary[libsuitesparseconfig]
@@ -224,7 +226,9 @@ const libumfpack = LazyLibrary(
 )
 
 function eager_mode()
-    CompilerSupportLibraries_jll.eager_mode()
+    @static if @isdefined CompilerSupportLibraries_jll
+        CompilerSupportLibraries_jll.eager_mode()
+    end
     libblastrampoline_jll.eager_mode()
 
     dlopen(libamd)

stdlib/Zstd_jll/src/Zstd_jll.jl

@@ -4,7 +4,7 @@
 #
 baremodule Zstd_jll
 using Base, Libdl
-if Sys.iswindows()
+if Sys.iswindows() && Sys.WORD_SIZE == 32
     using CompilerSupportLibraries_jll
 end
 
@@ -28,7 +28,7 @@ const libzstd = LazyLibrary(
     else
         error("Zstd_jll: Library 'libzstd' is not available for $(Sys.KERNEL)")
     end;
-    dependencies = if Sys.iswindows()
+    dependencies = if Sys.iswindows() && Sys.WORD_SIZE == 32
         LazyLibrary[libgcc_s]
     else
         LazyLibrary[]

stdlib/libLLVM_jll/src/libLLVM_jll.jl

@@ -3,7 +3,11 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/libLLVM_jll.jl
 
 baremodule libLLVM_jll
-using Base, Libdl, Zlib_jll, Zstd_jll, CompilerSupportLibraries_jll
+using Base, Libdl, Zlib_jll, Zstd_jll
+
+if !Sys.isapple()
+    using CompilerSupportLibraries_jll
+end
 
 export libLLVM
 
@@ -33,7 +37,9 @@ const libLLVM = LazyLibrary(
 )
 
 function eager_mode()
-    CompilerSupportLibraries_jll.eager_mode()
+    @static if @isdefined CompilerSupportLibraries_jll
+        CompilerSupportLibraries_jll.eager_mode()
+    end
     Zlib_jll.eager_mode()
     # Zstd_jll.eager_mode() # Not lazy yet
     dlopen(libLLVM)

stdlib/nghttp2_jll/src/nghttp2_jll.jl

@@ -3,7 +3,7 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/nghttp2_jll.jl
 baremodule nghttp2_jll
 using Base, Libdl
-if Sys.iswindows()
+if Sys.iswindows() && Sys.WORD_SIZE == 32
     using CompilerSupportLibraries_jll
 end
 
@@ -25,7 +25,7 @@ const libnghttp2 = LazyLibrary(
     else
         BundledLazyLibraryPath("libnghttp2.so.14")
     end,
-    dependencies = if Sys.iswindows()
+    dependencies = if Sys.iswindows() && Sys.WORD_SIZE == 32
         LazyLibrary[libgcc_s]
     else
         LazyLibrary[]