Skip to content

Commit

Permalink
fix rebase error..
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Mar 22, 2024
1 parent 6c445c4 commit 35b2008
Showing 1 changed file with 7 additions and 19 deletions.
26 changes: 7 additions & 19 deletions base/precompilation.jl
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,6 @@ function ExplicitEnv(envpath::String=Base.active_project())
names[UUID(proj_uuid)] = proj_name
end

#=
if !project_is_package
base_project_file = base_project(envpath)
if base_project_file !== nothing
base_project_d = parsed_toml(base_project_file)
for (name, _uuid) in get(Dict{String, Any}, base_project_d, "deps")::Dict{String, Any}
uuid = UUID(_uuid)
project_deps[name] = uuid
names[UUID(uuid)] = name
project_uuid_to_name[name] = UUID(uuid)
end
end
end
=#

project_extensions = Dict{String, Vector{UUID}}()
# Collect all extensions of the project
for (name, triggers::Union{String, Vector{String}}) in get(Dict{String, Any}, project_d, "extensions")::Dict{String, Any}
Expand Down Expand Up @@ -574,11 +559,14 @@ function precompilepkgs(pkgs::Vector{String}=String[];
target = "manifest"
end

nconfig = length(configs)
if nconfig > 1
target *= " for $nconfig compilation configurations..."
else
nconfigs = length(configs)
if nconfigs == 1
if !isempty(only(configs)[1])
target *= " for configuration $(join(only(configs)[1], " "))"
end
target *= "..."
else
target *= " for $nconfigs compilation configurations..."
end
@debug "precompile: packages filtered"

Expand Down

0 comments on commit 35b2008

Please sign in to comment.