Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Max Horn <max@quendi.de>
  • Loading branch information
staticfloat and fingolfin authored Jul 27, 2023
1 parent ca3bea1 commit 4c70b0a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion base/Base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ include(mapexpr::Function, mod::Module, _path::AbstractString) = _include(mapexp
Core.println("JuliaSyntax/src/JuliaSyntax.jl")
include(@__MODULE__, "JuliaSyntax/src/JuliaSyntax.jl")

# Finish up by inserting lazy libraries for the JLLS that must be loaded during bootstrap
# Finish up by inserting lazy libraries for the JLLs that must be loaded during bootstrap
include(@__MODULE__, "base_jll_insertion.jl")

end_base_include = time_ns()
Expand Down
4 changes: 2 additions & 2 deletions base/base_jll_adapters.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file serves as a way to provide access to libraries that Base needs
# that are usually included as artifacts. We can't use Artifacts this early
# becuase we haven't bootstrapped far enough, so this file contains "Base"
# because we haven't bootstrapped far enough, so this file contains "Base"
# JLLs that are manually adapted to load things from hardcoded paths so that
# we can bootstrap, but once GMP_jll, MPFR_jll, etc... are loaded, we replace
# the definitions here with the `LazyLibrary` objects defined there, as they
Expand Down Expand Up @@ -42,7 +42,7 @@ Base.cconvert(::Type{Cstring}, llp::LazyLibraryPath) = Base.cconvert(Cstring, st
Base.print(io::IO, llp::LazyLibraryPath) = print(io, string(llp))

# Helper to get `Sys.BINDIR` at runtime
struct SysBindirGetter; end
struct SysBindirGetter end
Base.string(::SysBindirGetter) = string(ccall(:jl_get_julia_bindir, Any, ())::String, early_pathsep, "..")

"""
Expand Down
2 changes: 1 addition & 1 deletion base/base_jll_insertion.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Insert LazyLibrary for `libpcre`, although at this time this gets lazily
# Insert LazyLibrary for `libpcre`, although at this time this gets lazily loaded
# on startup because `include()` calls `isdirpath()` which has a regex in it.
using Base.JLLAdapters: libpcre2_8, libpcre2_8_name
using Base.Libc.Libdl: BundledLazyLibraryPath, LazyLibrary
Expand Down

0 comments on commit 4c70b0a

Please sign in to comment.