only load CompilerSupportLibraries_jll when needed

Author: IanButterworth

stdlib/LibCURL_jll/src/LibCURL_jll.jl

@@ -8,7 +8,9 @@ if !(Sys.iswindows() || Sys.isapple())
     # On Windows and macOS we use system SSL/crypto libraries
     using OpenSSL_jll
 end
-using CompilerSupportLibraries_jll
+if Sys.iswindows()
+    using CompilerSupportLibraries_jll
+end
 
 export libcurl
 

stdlib/LibGit2_jll/src/LibGit2_jll.jl

@@ -8,7 +8,9 @@ if !(Sys.iswindows() || Sys.isapple())
     # On Windows and macOS we use system SSL/crypto libraries
     using OpenSSL_jll
 end
-using CompilerSupportLibraries_jll
+if Sys.iswindows()
+    using CompilerSupportLibraries_jll
+end
 
 export libgit2
 

stdlib/LibSSH2_jll/src/LibSSH2_jll.jl

@@ -7,8 +7,9 @@ using Base, Libdl, Zlib_jll
 if !Sys.iswindows()
     # On Windows we use system SSL/crypto libraries
     using OpenSSL_jll
+else
+    using CompilerSupportLibraries_jll
 end
-using CompilerSupportLibraries_jll
 
 export libssh2
 

stdlib/LibUnwind_jll/src/LibUnwind_jll.jl

@@ -4,8 +4,10 @@
 
 baremodule LibUnwind_jll
 using Base, Libdl
-using CompilerSupportLibraries_jll
 using Zlib_jll
+if !Sys.isfreebsd()
+    using CompilerSupportLibraries_jll
+end
 
 export libunwind
 
@@ -28,7 +30,9 @@ const libunwind = LazyLibrary(_libunwind_path, dependencies=_libunwind_dependenc
 
 
 function eager_mode()
-    CompilerSupportLibraries_jll.eager_mode()
+    @static if !Sys.isfreebsd()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
     Zlib_jll.eager_mode()
     dlopen(libunwind)
 end

stdlib/MPFR_jll/src/MPFR_jll.jl

@@ -2,7 +2,10 @@
 
 ## dummy stub for https://github.com/JuliaBinaryWrappers/MPFR_jll.jl
 baremodule MPFR_jll
-using Base, Libdl, GMP_jll, CompilerSupportLibraries_jll
+using Base, Libdl, GMP_jll
+if Sys.iswindows()
+    using CompilerSupportLibraries_jll
+end
 
 export libmpfr
 

stdlib/Zstd_jll/src/Zstd_jll.jl

@@ -3,7 +3,10 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/Zstd_jll.j:
 #
 baremodule Zstd_jll
-using Base, Libdl, CompilerSupportLibraries_jll
+using Base, Libdl
+if Sys.iswindows()
+    using CompilerSupportLibraries_jll
+end
 
 export libzstd, zstd, zstdmt
 
@@ -79,10 +82,10 @@ zstdmt() = adjust_ENV(`$(joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR, zstdmt_ex
 
 # Function to eagerly dlopen our library and thus resolve all dependencies
 function eager_mode()
-    dlopen(libzstd)
     @static if Sys.iswindows()
         CompilerSupportLibraries_jll.eager_mode()
     end
+    dlopen(libzstd)
 end
 
 is_available() = true

stdlib/nghttp2_jll/src/nghttp2_jll.jl

@@ -2,7 +2,10 @@
 
 ## dummy stub for https://github.com/JuliaBinaryWrappers/nghttp2_jll.jl
 baremodule nghttp2_jll
-using Base, Libdl, CompilerSupportLibraries_jll
+using Base, Libdl
+if Sys.iswindows()
+    using CompilerSupportLibraries_jll
+end
 
 export libnghttp2
 
@@ -31,7 +34,9 @@ const libnghttp2 = LazyLibrary(_libnghttp2_path, dependencies=_libnghttp2_depend
 
 function eager_mode()
     dlopen(libnghttp2)
-    Sys.iswindows() && CompilerSupportLibraries_jll.eager_mode()
+    @static if Sys.iswindows()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
 end
 is_available() = true