Skip to content

Commit 7a1f8b4

Browse files
committed
Fix git CA cert path loading
1 parent ee7f2a1 commit 7a1f8b4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

BinaryBuilderToolchains.jl/src/toolchains/HostToolsToolchain.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ function toolchain_sources(toolchain::HostToolsToolchain)
174174
# Fix relocatability issues
175175
println(io, """
176176
export GIT_EXEC_PATH=\"$(toolchain_prefix)/libexec/git-core\"
177-
export GIT_SSL_CAPATH=\"$(toolchain_prefix)/etc/certs\"
177+
export GIT_SSL_CAPATH=\"\${SSL_CERT_DIR}\"
178+
export GIT_SSL_CAINFO=\"\${SSL_CERT_FILE}\"
178179
export GIT_TEMPLATE_DIR=\"$(toolchain_prefix)/share/git-core/templates\"
179180
""")
180181
end
@@ -266,6 +267,7 @@ function toolchain_env(::HostToolsToolchain, deployed_prefix::String)
266267

267268
# Use the bundled CA root file
268269
env["SSL_CERT_DIR"] = joinpath(deployed_prefix, "etc", "certs")
270+
env["SSL_CERT_FILE"] = joinpath(deployed_prefix, "etc", "certs", "ca-certificates.crt")
269271

270272
# Apply LD_LIBRARY_PATH for CSL
271273
if Sys.iswindows()

0 commit comments

Comments
 (0)