Skip to content

Commit 75cdd34

Browse files
windows fixes
1 parent feb6dea commit 75cdd34

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

stdlib/LibGit2_jll/src/LibGit2_jll.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ else
3030
const _libgit2_path = BundledLazyLibraryPath("libgit2.so.1.9")
3131
end
3232

33-
if Sys.iswindows()
33+
if Sys.iswindows() && Sys.WORD_SIZE == 32
3434
_libgit2_dependencies = LazyLibrary[libssh2, libgcc_s]
3535
elseif Sys.isfreebsd() || Sys.islinux()
3636
_libgit2_dependencies = LazyLibrary[libssh2, libssl, libcrypto]

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,28 @@ else
7878
end
7979
const libcolamd = LazyLibrary(_libcolamd_path; dependencies=_libcolamd_dependencies)
8080

81-
if Sys.iswindows()
81+
if Sys.iswindows() && Sys.WORD_SIZE == 32
8282
_libamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
8383
else
8484
_libamd_dependencies = LazyLibrary[libsuitesparseconfig]
8585
end
8686
const libamd = LazyLibrary(_libamd_path; dependencies=_libamd_dependencies)
8787

88-
if Sys.iswindows()
88+
if Sys.iswindows() && Sys.WORD_SIZE == 32
8989
_libcamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
9090
else
9191
_libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
9292
end
9393
const libcamd = LazyLibrary(_libcamd_path; dependencies=_libcamd_dependencies)
9494

95-
if Sys.iswindows()
95+
if Sys.iswindows() && Sys.WORD_SIZE == 32
9696
_libccolamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
9797
else
9898
_libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
9999
end
100100
const libccolamd = LazyLibrary(_libccolamd_path; dependencies=_libccolamd_dependencies)
101101

102-
if Sys.iswindows()
102+
if Sys.iswindows() && Sys.WORD_SIZE == 32
103103
_librbio_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
104104
else
105105
_librbio_dependencies = LazyLibrary[libsuitesparseconfig]
@@ -117,7 +117,7 @@ else
117117
end
118118
const libcholmod = LazyLibrary(_libcholmod_path; dependencies=_libcholmod_dependencies)
119119

120-
if Sys.iswindows()
120+
if Sys.iswindows() && Sys.WORD_SIZE == 32
121121
_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf, libgcc_s]
122122
else
123123
_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
@@ -133,7 +133,7 @@ else
133133
end
134134
const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
135135

136-
if Sys.iswindows()
136+
if Sys.iswindows() && Sys.WORD_SIZE == 32
137137
_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline, libgcc_s]
138138
else
139139
_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]

0 commit comments

Comments
 (0)