diff --git a/contrib/juliac/juliac-buildscript.jl b/contrib/juliac/juliac-buildscript.jl index 80a3fd756bcd0..2412b485660ec 100644 --- a/contrib/juliac/juliac-buildscript.jl +++ b/contrib/juliac/juliac-buildscript.jl @@ -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() @@ -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 @@ -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