@@ -6,8 +6,6 @@ using SHA, CodecZlib, TOML, LibGit2_jll
66import Bzip2_jll, Gzip_jll, Tar_jll, XZ_jll, Zstd_jll, unzip_jll
77using JLLWrappers: pathsep, LIBPATH_env
88
9- @debug " Prefix module loaded with debug logging enabled"
10-
119export Prefix, bindir, libdirs, includedir, logdir, temp_prefix, package
1210
1311"""
@@ -364,10 +362,8 @@ function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags
364362 libpath = vcat (XZ_jll. LIBPATH_list, libpath)
365363 end
366364 if Zstd_jll. is_available ()
367- # Zstd_jll became a stdlib in Julia v1.13.0 and the path variable changed name
368- zpath = isdefined (Zstd_jll, :libzstd_path ) ? Zstd_jll. libzstd_path : Zstd_jll. zstd_path
369- path = vcat (dirname (zpath), path)
370- libpath = vcat (Zstd_jll. LIBPATH_list, libpath)
365+ path = vcat (dirname (Zstd_jll. zstd_path), path)
366+ libpath = vcat (XZ_jll. LIBPATH_list, libpath)
371367 end
372368 unique! (filter! (! isempty, path))
373369 unique! (filter! (! isempty, libpath))
0 commit comments