Skip to content

Commit 7b6e810

Browse files
authored
Use libsuitesparseconfig from JLL (#620)
This prevents us from being influenced by things like `LD_LIBRARY_PATH`, and ensures that we always load the correct `libsuitesparseconfig` that came with our JLL.
1 parent b225a85 commit 7b6e810

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/solvers/cholmod.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,16 @@ function __init__()
231231

232232
# Register gc tracked allocator if CHOLMOD is new enough
233233
if current_version >= v"4.0.3"
234-
ccall((:SuiteSparse_config_malloc_func_set, :libsuitesparseconfig),
234+
ccall((:SuiteSparse_config_malloc_func_set, libsuitesparseconfig),
235235
Cvoid, (Ptr{Cvoid},), cglobal(:jl_malloc, Ptr{Cvoid}))
236-
ccall((:SuiteSparse_config_calloc_func_set, :libsuitesparseconfig),
236+
ccall((:SuiteSparse_config_calloc_func_set, libsuitesparseconfig),
237237
Cvoid, (Ptr{Cvoid},), cglobal(:jl_calloc, Ptr{Cvoid}))
238-
ccall((:SuiteSparse_config_realloc_func_set, :libsuitesparseconfig),
238+
ccall((:SuiteSparse_config_realloc_func_set, libsuitesparseconfig),
239239
Cvoid, (Ptr{Cvoid},), cglobal(:jl_realloc, Ptr{Cvoid}))
240-
ccall((:SuiteSparse_config_free_func_set, :libsuitesparseconfig),
240+
ccall((:SuiteSparse_config_free_func_set, libsuitesparseconfig),
241241
Cvoid, (Ptr{Cvoid},), cglobal(:jl_free, Ptr{Cvoid}))
242242
elseif current_version >= v"3.0.0"
243-
cnfg = cglobal((:SuiteSparse_config, :libsuitesparseconfig), Ptr{Cvoid})
243+
cnfg = cglobal((:SuiteSparse_config, libsuitesparseconfig), Ptr{Cvoid})
244244
unsafe_store!(cnfg, cglobal(:jl_malloc, Ptr{Cvoid}), 1)
245245
unsafe_store!(cnfg, cglobal(:jl_calloc, Ptr{Cvoid}), 2)
246246
unsafe_store!(cnfg, cglobal(:jl_realloc, Ptr{Cvoid}), 3)

0 commit comments

Comments
 (0)