Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions contrib/juliac/juliac-buildscript.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

# Script to run in the process that generates juliac's object file output

# Run the verifier in the current world (before modifications), so that error
# messages and types print in their usual way.
Core.Compiler._verify_trim_world_age[] = Base.get_world_counter()

# Initialize some things not usually initialized when output is requested
Sys.__init__()
Base.init_depot_path()
Expand All @@ -23,10 +19,6 @@ if Base.get_bool_env("JULIA_USE_FLISP_PARSER", false) === false
Base.JuliaSyntax.enable_in_core!()
end

if Base.JLOptions().trim != 0
include(joinpath(@__DIR__, "juliac-trim-base.jl"))
end

# Load user code

import Base.Experimental.entrypoint
Expand Down Expand Up @@ -80,7 +72,12 @@ let include_result = Base.include(Main, ARGS[1])
end
end

# Run the verifier in the current world (before build-script modifications),
# so that error messages and types print in their usual way.
Core.Compiler._verify_trim_world_age[] = Base.get_world_counter()

if Base.JLOptions().trim != 0
include(joinpath(@__DIR__, "juliac-trim-base.jl"))
include(joinpath(@__DIR__, "juliac-trim-stdlib.jl"))
end

Expand Down