Skip to content

Commit 99719f8

Browse files
committed
Revert "And suddenly all artifacts are potentially lazy"
This reverts commit 2f1eea4.
1 parent dcc90d3 commit 99719f8

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/toplevel_generators.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function generate_imports(src_name)
2828
# Use slow Pkg-based Artifacts
2929
return quote
3030
using Libdl, Pkg, Pkg.BinaryPlatforms, Pkg.Artifacts
31-
using Pkg.Artifacts: load_artifacts_toml, unpack_platform, ensure_artifact_installed
31+
using Pkg.Artifacts: load_artifacts_toml, unpack_platform
3232
using Pkg.BinaryPlatforms: triplet, select_platform
3333
HostPlatform() = platform_key_abi()
3434
if !@isdefined(augment_platform!)
@@ -41,7 +41,6 @@ function generate_imports(src_name)
4141
using Libdl, Artifacts, JLLWrappers.Preferences, Base.BinaryPlatforms
4242
using Artifacts: load_artifacts_toml, unpack_platform
4343
using Base.BinaryPlatforms: triplet, select_platform
44-
using Pkg.Artifacts: ensure_artifact_installed
4544
if !@isdefined(augment_platform!)
4645
augment_platform!(platform) = platform
4746
end
@@ -129,8 +128,8 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
129128
# a `let` block here to avoid storing unnecessary data in our `.ji` files
130129

131130
const host_platform = augment_platform!(HostPlatform())
132-
const artifacts_toml = joinpath($(pkg_dir), "..", "Artifacts.toml")
133131
best_wrapper = let
132+
artifacts_toml = joinpath($(pkg_dir), "..", "Artifacts.toml")
134133
valid_wrappers = Dict{Platform,String}()
135134
artifacts = load_artifacts_toml(artifacts_toml; pkg_uuid=$(pkg_uuid))[$(src_name)]
136135

@@ -176,8 +175,6 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
176175
@debug(string("Unable to load ", $(src_name), "; unsupported platform ", triplet(host_platform)))
177176
is_available() = false
178177
else
179-
# FIXME: This is horrid
180-
ensure_artifact_installed($(src_name), artifacts_toml; platform=host_platform, pkg_uuid=$(pkg_uuid))
181178
Base.include($(Symbol("$(src_name)_jll")), best_wrapper)
182179
is_available() = true
183180
end

0 commit comments

Comments
 (0)