Skip to content

Commit 20f4d4f

Browse files
dep fixes
1 parent d3c81d9 commit 20f4d4f

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ if Sys.isfreebsd()
8181
_libstdcxx_dependencies = LazyLibrary[]
8282
elseif Sys.isapple()
8383
_libstdcxx_dependencies = LazyLibrary[libgcc_s]
84+
elseif Sys.islinux()
85+
_libstdcxx_dependencies = LazyLibrary[libgcc_s]
8486
else
8587
_libstdcxx_dependencies = LazyLibrary[libgcc_s, libgfortran]
8688
end

stdlib/LibGit2_jll/src/LibGit2_jll.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ const LIBPATH_list = String[]
1919
artifact_dir::String = ""
2020
libgit2_path::String = ""
2121

22-
_libgit2_dependencies = LazyLibrary[libssh2]
2322
if Sys.iswindows()
2423
const _libgit2_path = BundledLazyLibraryPath("libgit2.dll")
2524
elseif Sys.isapple()
2625
const _libgit2_path = BundledLazyLibraryPath("libgit2.1.9.dylib")
2726
else
2827
const _libgit2_path = BundledLazyLibraryPath("libgit2.so.1.9")
29-
append!(_libgit2_dependencies, [libcrypto, libssl])
3028
end
3129

30+
if Sys.isfreebsd()
31+
_libgit2_dependencies = LazyLibrary[]
32+
elseif Sys.islinux()
33+
_libgit2_dependencies = LazyLibrary[libssh2, libssl, libcrypto]
34+
else
35+
_libgit2_dependencies = LazyLibrary[libssh2]
36+
end
3237
const libgit2 = LazyLibrary(_libgit2_path, dependencies=_libgit2_dependencies)
3338

3439
function eager_mode()

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ if Sys.isapple()
3434
if isdefined(CompilerSupportLibraries_jll, :libquadmath)
3535
push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libquadmath)
3636
end
37+
if Sys.ARCH == :aarch64
38+
push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libgcc_s)
39+
end
3740
elseif Sys.isfreebsd()
3841
_libopenblas_dependencies = LazyLibrary[]
3942
else

0 commit comments

Comments
 (0)