lazify libLLVM_jll

Author: IanButterworth

stdlib/libLLVM_jll/Project.toml

@@ -3,10 +3,14 @@ uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a"
 version = "20.1.2+0"
 
 [deps]
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
 
 [compat]
+CompilerSupportLibraries_jll = "1.3.0"
+Zlib_jll = "1.3.1"
 julia = "1.13"
 
 [extras]

stdlib/libLLVM_jll/src/libLLVM_jll.jl

@@ -3,43 +3,45 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/libLLVM_jll.jl
 
 baremodule libLLVM_jll
-using Base, Libdl
-
-const PATH_list = String[]
-const LIBPATH_list = String[]
+using Base, Libdl, CompilerSupportLibraries_jll, Zlib_jll
 
 export libLLVM
 
 # These get calculated in __init__()
 const PATH = Ref("")
+const PATH_list = String[]
 const LIBPATH = Ref("")
+const LIBPATH_list = String[]
 artifact_dir::String = ""
-libLLVM_handle::Ptr{Cvoid} = C_NULL
 libLLVM_path::String = ""
 
+_libLLVM_dependencies = LazyLibrary[libstdcxx, libgcc_s, libz]
+
 if Sys.iswindows()
-    const libLLVM = "$(Base.libllvm_name).dll"
+    const _libLLVM_path = BundledLazyLibraryPath("$(Base.libllvm_name).dll")
 elseif Sys.isapple()
-    const libLLVM = "@rpath/libLLVM.dylib"
+    const _libLLVM_path = BundledLazyLibraryPath("libLLVM.dylib")
 else
-    const libLLVM = "$(Base.libllvm_name).so"
+    const _libLLVM_path = BundledLazyLibraryPath("$(Base.libllvm_name).so")
 end
 
+const libLLVM = LazyLibrary(
+    _libLLVM_path,
+    dependencies=_libLLVM_dependencies,
+)
+
+function eager_mode()
+    CompilerSupportLibraries_jll.eager_mode()
+    Zlib_jll.eager_mode()
+    dlopen(libLLVM)
+end
+is_available() = true
+
 function __init__()
-    global libLLVM_handle = dlopen(libLLVM)
-    global libLLVM_path = dlpath(libLLVM_handle)
+    global libLLVM_path = string(_libLLVM_path)
     global artifact_dir = dirname(Sys.BINDIR)
     LIBPATH[] = dirname(libLLVM_path)
     push!(LIBPATH_list, LIBPATH[])
 end
 
-# JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
-# For instance, `find_artifact_dir()` won't actually be the artifact directory, because
-# there isn't one.  It instead returns the overall Julia prefix.
-is_available() = true
-find_artifact_dir() = artifact_dir
-dev_jll() = error("stdlib JLLs cannot be dev'ed")
-best_wrapper = nothing
-get_libLLVM_path() = libLLVM_path
-
 end  # module libLLVM_jll