Skip to content

Commit d5911c0

Browse files
committed
Fix Base.libblas_name/Base.liblapack_name
On Windows they need to include the major soversion of libblastrampoline.
1 parent bebff47 commit d5911c0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

base/Base.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,10 @@ end
186186
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "build_h.jl")) # include($BUILDROOT/base/build_h.jl)
187187
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "version_git.jl")) # include($BUILDROOT/base/version_git.jl)
188188

189-
# These used to be in build_h.jl and are retained for backwards compatibility
190-
const libblas_name = "libblastrampoline"
191-
const liblapack_name = "libblastrampoline"
189+
# These used to be in build_h.jl and are retained for backwards compatibility.
190+
# NOTE: keep in sync with `libblastrampoline_jll.libblastrampoline`.
191+
const libblas_name = "libblastrampoline" * (Sys.iswindows() ? "-5" : "")
192+
const liblapack_name = libblas_name
192193

193194
# numeric operations
194195
include("hashing.jl")

stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ artifact_dir = ""
1818
libblastrampoline_handle = C_NULL
1919
libblastrampoline_path = ""
2020

21+
# NOTE: keep in sync with `Base.libblas_name` and `Base.liblapack_name`.
2122
const libblastrampoline = if Sys.iswindows()
2223
"libblastrampoline-5.dll"
2324
elseif Sys.isapple()

0 commit comments

Comments
 (0)