Fix system image incompatibility with LibCURL.cacert (#84)

* Fix LibCURL.cacert when used in a sysimage * Set project version to 0.6.1 Co-authored-by: Nicole Epp <[email protected]>
JuliaWeb · Jun 24, 2020 · d018fe7 · d018fe7 · omus · Jun 24, 2020
1 parent 87ca1d1
commit d018fe7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "LibCURL"
 uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
-version = "0.6.0"
+version = "0.6.1"
 
 [deps]
 LibCURL_jll = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"

diff --git a/src/LibCURL.jl b/src/LibCURL.jl
@@ -10,10 +10,17 @@ const curl_off_t = Int64
 const fd_set = Union{}
 const socklen_t = Int32
 
-const cacert = MozillaCACerts_jll.cacert
+cacert = ""
 
 export Mime_ext
 
+function __init__()
+    # Note: `MozillaCACerts_jll.cacert` is filled by `__init__` which requires LibCURL's
+    # copy to also be filled in during initialization. Doing this ensures compatibility
+    # with building system images.
+    global cacert = MozillaCACerts_jll.cacert
+end
+
 include("lC_exports_h.jl")
 include("lC_common_h.jl")
 include("lC_curl_h.jl")