Skip to content

Commit 5117623

Browse files
undo debug
1 parent 3f9c082 commit 5117623

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

src/Prefix.jl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -714,16 +714,10 @@ function setup_dependencies(prefix::Prefix,
714714
push!(stdlib_pkgspecs, get_addable_spec(dep.name, dep.version; verbose))
715715
end
716716
end
717-
@show stdlib_pkgspecs
718717
# Re-install stdlib dependencies, but this time with `julia_version = nothing`
719718
if !isempty(stdlib_pkgspecs)
720-
stdlib_pkgspecs_2 = deepcopy(stdlib_pkgspecs)
721-
@info "1"
722-
dump(stdlib_pkgspecs_2[1])
723-
foreach(Pkg.API.handle_package_input!, stdlib_pkgspecs_2)
724-
@info "2"
725-
dump(stdlib_pkgspecs_2[1])
726-
Pkg_add(stdlib_pkgspecs; io=outs, platform=platform, julia_version=nothing)
719+
# TODO: shouldn't this take platform?
720+
Pkg_add(stdlib_pkgspecs; io=outs, julia_version=nothing)
727721
end
728722

729723
# Load their Artifacts.toml files

test/dependencies.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ end
177177
Dependency("Zlib_jll")
178178
]
179179
platform = HostPlatform()
180-
@show dependencies getpkg.(dependencies)
181-
_dependencies = deepcopy(getpkg.(dependencies))
182-
foreach(Pkg.API.handle_package_input!, _dependencies)
183-
@show _dependencies
184180
ap = test_setup_dependencies(prefix, getpkg.(dependencies), platform)
185181
@test "libz." * platform_dlext(platform) in readdir(last(libdirs(Prefix(destdir(dir, platform)))))
186182
@test sort!(readdir(joinpath(destdir(dir, platform), "include"))) == ["zconf.h", "zlib.h"]

0 commit comments

Comments
 (0)