Skip to content

Commit b4a92b2

Browse files
committed
[libjulia] Fix for openlibm on Windows
1 parent c1c8e87 commit b4a92b2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

L/libjulia/common.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function build_julia(ARGS, version; gitref = nothing)
2626
v"1.3.1" => "3d9037d281fb41ad67b443f42d8a8e400b016068d142d6fafce1952253ae93db",
2727
v"1.4.2" => "76a94e06e68fb99822e0876a37c2ed3873e9061e895ab826fd8c9fc7e2f52795",
2828
v"1.5.3" => "be19630383047783d6f314ebe0bf5e3f95f82b0c203606ec636dced405aab1fe",
29+
v"1.6.0" => "c253360d29abb9a3a9e6e01493e0f7bb537d88014fd58ac561b5ba30fcb44cad",
2930
)
3031

3132
if isnothing(gitref)
@@ -203,7 +204,11 @@ function build_julia(ARGS, version; gitref = nothing)
203204
# We don't trust the system libm in places
204205
# So we include a private copy of libopenlibm
205206
mkdir -p usr/lib
206-
cp ${prefix}/lib/libopenlibm.a usr/lib/
207+
if [[ "${target}" == *-mingw* ]] && [[ "${version}" == 1.6.* ]]; then
208+
cp ${prefix}/bin/libopenlibm.a usr/lib/
209+
else
210+
cp ${prefix}/lib/libopenlibm.a usr/lib/
211+
fi
207212
208213
# Mac build complains about checksum
209214
rm -rf /workspace/srcdir/julia-1.5.1/deps/checksums/lapack-3.9.0.tgz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include("../common.jl")
2-
build_julia(ARGS, v"1.6.0"; gitref = "f9720dc2ebd6cd9e3086365f281e62506444ef37")
2+
build_julia(ARGS, v"1.6.0")

0 commit comments

Comments
 (0)