Skip to content

Commit 958f647

Browse files
authored
Remove libuv_jll contents (#50601)
We link libuv statically, so there's no point in trying to use a JLL. I'm not removing the JLL entirely as removing stdlibs is difficult, and we may link libuv dynamically in the future. Fixes #50592
2 parents d080fe6 + eb74011 commit 958f647

File tree

2 files changed

+1
-41
lines changed

2 files changed

+1
-41
lines changed

stdlib/LibUV_jll/src/LibUV_jll.jl

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,6 @@ baremodule LibUV_jll
66
using Base, Libdl
77
Base.Experimental.@compiler_options compile=min optimize=0 infer=false
88

9-
const PATH_list = String[]
10-
const LIBPATH_list = String[]
11-
12-
export libuv
13-
14-
# These get calculated in __init__()
15-
const PATH = Ref("")
16-
const LIBPATH = Ref("")
17-
artifact_dir::String = ""
18-
libuv_handle::Ptr{Cvoid} = C_NULL
19-
libuv_path::String = ""
20-
21-
if Sys.iswindows()
22-
const libuv = "libuv-2.dll"
23-
elseif Sys.isapple()
24-
const libuv = "@rpath/libuv.2.dylib"
25-
else
26-
const libuv = "libuv.so.2"
27-
end
28-
29-
function __init__()
30-
global libuv_handle = dlopen(libuv)
31-
global libuv_path = dlpath(libuv_handle)
32-
global artifact_dir = dirname(Sys.BINDIR)
33-
LIBPATH[] = dirname(libuv_path)
34-
push!(LIBPATH_list, LIBPATH[])
35-
end
36-
37-
# JLLWrappers API compatibility shims. Note that not all of these will really make sense.
38-
# For instance, `find_artifact_dir()` won't actually be the artifact directory, because
39-
# there isn't one. It instead returns the overall Julia prefix.
40-
is_available() = true
41-
find_artifact_dir() = artifact_dir
42-
dev_jll() = error("stdlib JLLs cannot be dev'ed")
43-
best_wrapper = nothing
44-
get_libuv_path() = libuv_path
9+
# NOTE: This file is currently empty, as we link libuv statically for now.
4510

4611
end # module LibUV_jll

stdlib/LibUV_jll/test/runtests.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
# This file is a part of Julia. License is MIT: https://julialang.org/license
22

33
using Test, Libdl, LibUV_jll
4-
5-
@testset "LibUV_jll" begin
6-
vn = VersionNumber(unsafe_string(ccall((:uv_version_string, libuv), Cstring, ())))
7-
@test vn == v"2.0.0-dev"
8-
end

0 commit comments

Comments
 (0)