Skip to content

Commit 45dee9d

Browse files
committed
libcxxwrap_julia_jll build 0.7.1+1
1 parent 9f2e9fd commit 45dee9d

11 files changed

+201
-209
lines changed

Artifacts.toml

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,76 @@
11
[[libcxxwrap_julia]]
2-
arch = "aarch64"
2+
arch = "x86_64"
33
cxxstring_abi = "cxx11"
4-
git-tree-sha1 = "0c4b61f6589843d59b2f3f43bc4637fb393da90f"
5-
libc = "glibc"
6-
libgfortran_version = "4.0.0"
7-
os = "linux"
4+
git-tree-sha1 = "b5d844648385063a2f0fd617cb0c5a5db50db26b"
5+
os = "freebsd"
86

97
[[libcxxwrap_julia.download]]
10-
sha256 = "ae892ba6cbe75fa69fb3a05eecd366665d038bc46ee8977a5e109c5c6759881f"
11-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.aarch64-linux-gnu-libgfortran4-cxx11.tar.gz"
8+
sha256 = "09581f5c73a49be6b192b62380340561510256fc2c7f111c601a120067f13fd6"
9+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.x86_64-unknown-freebsd11.1-cxx11.tar.gz"
1210
[[libcxxwrap_julia]]
1311
arch = "armv7l"
1412
cxxstring_abi = "cxx11"
15-
git-tree-sha1 = "b50256b40afc4ff1cc775939a5e1aea3207c8041"
13+
git-tree-sha1 = "26e1f4739acafceedfb5fa545671ba787fd40010"
1614
libc = "glibc"
17-
libgfortran_version = "4.0.0"
1815
os = "linux"
1916

2017
[[libcxxwrap_julia.download]]
21-
sha256 = "cf5194ceb4a474d276903080718d1fe8e785ea5f9bb2349c27ff8d6116684b8c"
22-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.armv7l-linux-gnueabihf-libgfortran4-cxx11.tar.gz"
18+
sha256 = "5234d469d9d2505fc1d673553ec2fecd218ea488c83906e91182ea3f527399f9"
19+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.armv7l-linux-gnueabihf-cxx11.tar.gz"
2320
[[libcxxwrap_julia]]
24-
arch = "i686"
21+
arch = "x86_64"
2522
cxxstring_abi = "cxx11"
26-
git-tree-sha1 = "efbc0af8936d1650504fb6674fdc65d3bbec76ba"
27-
libc = "glibc"
28-
libgfortran_version = "4.0.0"
29-
os = "linux"
23+
git-tree-sha1 = "9530965e6a2fbdf8c857a5cd4729be80f215dc69"
24+
os = "macos"
3025

3126
[[libcxxwrap_julia.download]]
32-
sha256 = "4ede2f96ecf04b9a33831136fbe9580dcd0945678a40948b28edeb4574a251ab"
33-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.i686-linux-gnu-libgfortran4-cxx11.tar.gz"
27+
sha256 = "b0103dcd5d38833874d8f79355ea7ded4c7c987adc275aa51c76e744b232f990"
28+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.x86_64-apple-darwin14-cxx11.tar.gz"
3429
[[libcxxwrap_julia]]
3530
arch = "x86_64"
3631
cxxstring_abi = "cxx11"
37-
git-tree-sha1 = "49d41801aa44f688851bb6a9617f543dea73d823"
38-
libgfortran_version = "4.0.0"
32+
git-tree-sha1 = "4d54e82277daeea66dbc6729a14f8fae78fed582"
3933
os = "windows"
4034

4135
[[libcxxwrap_julia.download]]
42-
sha256 = "480d716f782341ee810da935bff74c77bb7d653620921fa579fdad7f4162238d"
43-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.x86_64-w64-mingw32-libgfortran4-cxx11.tar.gz"
36+
sha256 = "17f694d2194851957172c3b1ae873af8e7cfad610d99f07e1f6c6c9b839b688d"
37+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.x86_64-w64-mingw32-cxx11.tar.gz"
4438
[[libcxxwrap_julia]]
45-
arch = "i686"
39+
arch = "aarch64"
4640
cxxstring_abi = "cxx11"
47-
git-tree-sha1 = "7ee9f634281320d4ccf83623c3330217ecbc8cdc"
48-
libgfortran_version = "4.0.0"
49-
os = "windows"
41+
git-tree-sha1 = "181061893da01b1ef9ebac774144fd9d32d19aee"
42+
libc = "glibc"
43+
os = "linux"
5044

5145
[[libcxxwrap_julia.download]]
52-
sha256 = "1c78a97ba3ace6e33c56219008ace7280111e7d0a0472f9148d187d0b997c6b5"
53-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.i686-w64-mingw32-libgfortran4-cxx11.tar.gz"
46+
sha256 = "78ff31de6f99ee8cc5ba500cd79c13353d5de31e8138ff2bc44b42be39d708fe"
47+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.aarch64-linux-gnu-cxx11.tar.gz"
5448
[[libcxxwrap_julia]]
5549
arch = "x86_64"
5650
cxxstring_abi = "cxx11"
57-
git-tree-sha1 = "e833e7ac389d35aec966c090e46df3ae3d83dffa"
58-
libgfortran_version = "4.0.0"
59-
os = "freebsd"
51+
git-tree-sha1 = "d54a2909808f0f05123ef98f8eef4fcde1073e52"
52+
libc = "glibc"
53+
os = "linux"
6054

6155
[[libcxxwrap_julia.download]]
62-
sha256 = "5f017c8bc3d10ff4e371208d4f0c319e0179c3767aca89c9446d5f6708e12246"
63-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.x86_64-unknown-freebsd11.1-libgfortran4-cxx11.tar.gz"
56+
sha256 = "7a8ee2b7f81a299c884cdfe031b1d50d1479f26f4a3f7acc6c079435f55ae886"
57+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.x86_64-linux-gnu-cxx11.tar.gz"
6458
[[libcxxwrap_julia]]
65-
arch = "x86_64"
59+
arch = "i686"
6660
cxxstring_abi = "cxx11"
67-
git-tree-sha1 = "9eb8baf82d2a424d6268efb061c676627eba2777"
68-
libgfortran_version = "4.0.0"
69-
os = "macos"
61+
git-tree-sha1 = "3dbab8aa1f22d249cca1d7af5bc7d826e641960f"
62+
libc = "glibc"
63+
os = "linux"
7064

7165
[[libcxxwrap_julia.download]]
72-
sha256 = "d34f288ce82237b9a651fef31be829c27746caa1158c1451150edcc04db30765"
73-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.x86_64-apple-darwin14-libgfortran4-cxx11.tar.gz"
66+
sha256 = "ae609b5b0e4a199e62bc03522e57580152ea0005909ce702458978bf9392f6ea"
67+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.i686-linux-gnu-cxx11.tar.gz"
7468
[[libcxxwrap_julia]]
75-
arch = "x86_64"
69+
arch = "i686"
7670
cxxstring_abi = "cxx11"
77-
git-tree-sha1 = "fe0cbe951fc4a4dc82dbc028861699c168dab018"
78-
libc = "glibc"
79-
libgfortran_version = "4.0.0"
80-
os = "linux"
71+
git-tree-sha1 = "1efcae9ec164b1cdc9449d6da540bc51942b880a"
72+
os = "windows"
8173

8274
[[libcxxwrap_julia.download]]
83-
sha256 = "9e068d3b254a43c0ef1ab9201a63024518be95e49fb93aefcb134bdf50765493"
84-
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+0/libcxxwrap_julia.v0.7.1.x86_64-linux-gnu-libgfortran4-cxx11.tar.gz"
75+
sha256 = "35c7f1a2987fbf4118458d0b3dfd30760fe1ae2cc74f7544632eff8f521a0d93"
76+
url = "https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/releases/download/libcxxwrap_julia-v0.7.1+1/libcxxwrap_julia.v0.7.1.i686-w64-mingw32-cxx11.tar.gz"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "libcxxwrap_julia_jll"
22
uuid = "3eaa8342-bff7-56a5-9981-c04077f7cee7"
3-
version = "0.7.1+0"
3+
version = "0.7.1+1"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The code bindings within this package are autogenerated from the following `Prod
1010

1111
```julia
1212
products = [
13-
LibraryProduct(["libcxxwrap_julia"], :libcxxwrap_julia),
14-
LibraryProduct(["libcxxwrap_julia_stl"], :libcxxwrap_julia_stl)
13+
LibraryProduct(["libcxxwrap_julia_stl"], :libcxxwrap_julia_stl),
14+
LibraryProduct(["libcxxwrap_julia"], :libcxxwrap_julia)
1515
]
1616
```
1717

src/wrappers/aarch64-linux-gnu-libgfortran4-cxx11.jl renamed to src/wrappers/aarch64-linux-gnu-cxx11.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
# Autogenerated wrapper script for libcxxwrap_julia_jll for aarch64-linux-gnu-libgfortran4-cxx11
2-
export libcxxwrap_julia, libcxxwrap_julia_stl
1+
# Autogenerated wrapper script for libcxxwrap_julia_jll for aarch64-linux-gnu-cxx11
2+
export libcxxwrap_julia_stl, libcxxwrap_julia
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88
LIBPATH_default = ""
99

10-
# Relative path to `libcxxwrap_julia`
11-
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
10+
# Relative path to `libcxxwrap_julia_stl`
11+
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
1212

1313
# This will be filled out by __init__() for all products, as it must be done at runtime
14-
libcxxwrap_julia_path = ""
14+
libcxxwrap_julia_stl_path = ""
1515

16-
# libcxxwrap_julia-specific global declaration
16+
# libcxxwrap_julia_stl-specific global declaration
1717
# This will be filled out by __init__()
18-
libcxxwrap_julia_handle = C_NULL
18+
libcxxwrap_julia_stl_handle = C_NULL
1919

2020
# This must be `const` so that we can use it with `ccall()`
21-
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
21+
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
2222

2323

24-
# Relative path to `libcxxwrap_julia_stl`
25-
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
24+
# Relative path to `libcxxwrap_julia`
25+
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
2626

2727
# This will be filled out by __init__() for all products, as it must be done at runtime
28-
libcxxwrap_julia_stl_path = ""
28+
libcxxwrap_julia_path = ""
2929

30-
# libcxxwrap_julia_stl-specific global declaration
30+
# libcxxwrap_julia-specific global declaration
3131
# This will be filled out by __init__()
32-
libcxxwrap_julia_stl_handle = C_NULL
32+
libcxxwrap_julia_handle = C_NULL
3333

3434
# This must be `const` so that we can use it with `ccall()`
35-
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
35+
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
3636

3737

3838
"""
@@ -45,19 +45,19 @@ function __init__()
4545
global PATH_list, LIBPATH_list
4646
# We first need to add to LIBPATH_list the libraries provided by Julia
4747
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
48-
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
48+
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
4949

5050
# Manually `dlopen()` this right now so that future invocations
5151
# of `ccall` with its `SONAME` will find this path immediately.
52-
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
53-
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
52+
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
53+
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
5454

55-
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
55+
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
5656

5757
# Manually `dlopen()` this right now so that future invocations
5858
# of `ccall` with its `SONAME` will find this path immediately.
59-
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
60-
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
59+
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
60+
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
6161

6262
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6363
filter!(!isempty, unique!(PATH_list))

src/wrappers/armv7l-linux-gnueabihf-libgfortran4-cxx11.jl renamed to src/wrappers/armv7l-linux-gnueabihf-cxx11.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
# Autogenerated wrapper script for libcxxwrap_julia_jll for armv7l-linux-gnueabihf-libgfortran4-cxx11
2-
export libcxxwrap_julia, libcxxwrap_julia_stl
1+
# Autogenerated wrapper script for libcxxwrap_julia_jll for armv7l-linux-gnueabihf-cxx11
2+
export libcxxwrap_julia_stl, libcxxwrap_julia
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88
LIBPATH_default = ""
99

10-
# Relative path to `libcxxwrap_julia`
11-
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
10+
# Relative path to `libcxxwrap_julia_stl`
11+
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
1212

1313
# This will be filled out by __init__() for all products, as it must be done at runtime
14-
libcxxwrap_julia_path = ""
14+
libcxxwrap_julia_stl_path = ""
1515

16-
# libcxxwrap_julia-specific global declaration
16+
# libcxxwrap_julia_stl-specific global declaration
1717
# This will be filled out by __init__()
18-
libcxxwrap_julia_handle = C_NULL
18+
libcxxwrap_julia_stl_handle = C_NULL
1919

2020
# This must be `const` so that we can use it with `ccall()`
21-
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
21+
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
2222

2323

24-
# Relative path to `libcxxwrap_julia_stl`
25-
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
24+
# Relative path to `libcxxwrap_julia`
25+
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
2626

2727
# This will be filled out by __init__() for all products, as it must be done at runtime
28-
libcxxwrap_julia_stl_path = ""
28+
libcxxwrap_julia_path = ""
2929

30-
# libcxxwrap_julia_stl-specific global declaration
30+
# libcxxwrap_julia-specific global declaration
3131
# This will be filled out by __init__()
32-
libcxxwrap_julia_stl_handle = C_NULL
32+
libcxxwrap_julia_handle = C_NULL
3333

3434
# This must be `const` so that we can use it with `ccall()`
35-
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
35+
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
3636

3737

3838
"""
@@ -45,19 +45,19 @@ function __init__()
4545
global PATH_list, LIBPATH_list
4646
# We first need to add to LIBPATH_list the libraries provided by Julia
4747
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
48-
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
48+
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
4949

5050
# Manually `dlopen()` this right now so that future invocations
5151
# of `ccall` with its `SONAME` will find this path immediately.
52-
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
53-
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
52+
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
53+
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
5454

55-
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
55+
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
5656

5757
# Manually `dlopen()` this right now so that future invocations
5858
# of `ccall` with its `SONAME` will find this path immediately.
59-
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
60-
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
59+
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
60+
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
6161

6262
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6363
filter!(!isempty, unique!(PATH_list))

src/wrappers/i686-linux-gnu-libgfortran4-cxx11.jl renamed to src/wrappers/i686-linux-gnu-cxx11.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
# Autogenerated wrapper script for libcxxwrap_julia_jll for i686-linux-gnu-libgfortran4-cxx11
2-
export libcxxwrap_julia, libcxxwrap_julia_stl
1+
# Autogenerated wrapper script for libcxxwrap_julia_jll for i686-linux-gnu-cxx11
2+
export libcxxwrap_julia_stl, libcxxwrap_julia
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88
LIBPATH_default = ""
99

10-
# Relative path to `libcxxwrap_julia`
11-
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
10+
# Relative path to `libcxxwrap_julia_stl`
11+
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
1212

1313
# This will be filled out by __init__() for all products, as it must be done at runtime
14-
libcxxwrap_julia_path = ""
14+
libcxxwrap_julia_stl_path = ""
1515

16-
# libcxxwrap_julia-specific global declaration
16+
# libcxxwrap_julia_stl-specific global declaration
1717
# This will be filled out by __init__()
18-
libcxxwrap_julia_handle = C_NULL
18+
libcxxwrap_julia_stl_handle = C_NULL
1919

2020
# This must be `const` so that we can use it with `ccall()`
21-
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
21+
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
2222

2323

24-
# Relative path to `libcxxwrap_julia_stl`
25-
const libcxxwrap_julia_stl_splitpath = ["lib", "libcxxwrap_julia_stl.so"]
24+
# Relative path to `libcxxwrap_julia`
25+
const libcxxwrap_julia_splitpath = ["lib", "libcxxwrap_julia.so"]
2626

2727
# This will be filled out by __init__() for all products, as it must be done at runtime
28-
libcxxwrap_julia_stl_path = ""
28+
libcxxwrap_julia_path = ""
2929

30-
# libcxxwrap_julia_stl-specific global declaration
30+
# libcxxwrap_julia-specific global declaration
3131
# This will be filled out by __init__()
32-
libcxxwrap_julia_stl_handle = C_NULL
32+
libcxxwrap_julia_handle = C_NULL
3333

3434
# This must be `const` so that we can use it with `ccall()`
35-
const libcxxwrap_julia_stl = "libcxxwrap_julia_stl.so"
35+
const libcxxwrap_julia = "libcxxwrap_julia.so.0"
3636

3737

3838
"""
@@ -45,19 +45,19 @@ function __init__()
4545
global PATH_list, LIBPATH_list
4646
# We first need to add to LIBPATH_list the libraries provided by Julia
4747
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
48-
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
48+
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
4949

5050
# Manually `dlopen()` this right now so that future invocations
5151
# of `ccall` with its `SONAME` will find this path immediately.
52-
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
53-
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
52+
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
53+
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
5454

55-
global libcxxwrap_julia_stl_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_stl_splitpath...))
55+
global libcxxwrap_julia_path = normpath(joinpath(artifact_dir, libcxxwrap_julia_splitpath...))
5656

5757
# Manually `dlopen()` this right now so that future invocations
5858
# of `ccall` with its `SONAME` will find this path immediately.
59-
global libcxxwrap_julia_stl_handle = dlopen(libcxxwrap_julia_stl_path, RTLD_GLOBAL)
60-
push!(LIBPATH_list, dirname(libcxxwrap_julia_stl_path))
59+
global libcxxwrap_julia_handle = dlopen(libcxxwrap_julia_path, RTLD_GLOBAL)
60+
push!(LIBPATH_list, dirname(libcxxwrap_julia_path))
6161

6262
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6363
filter!(!isempty, unique!(PATH_list))

0 commit comments

Comments
 (0)