Skip to content

Commit e7308b1

Browse files
committed
Fix type instabilities in the init_header caused by find_artifact_dir being poorly inferred and eager_mode not constant folding to being set.
1 parent b5f2a74 commit e7308b1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/wrapper_generators.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ macro generate_init_header(dependencies...)
3434
isdefined($(dep), :PATH_list) && append!(PATH_list, $(dep).PATH_list)
3535
isdefined($(dep), :LIBPATH_list) && append!(LIBPATH_list, $(dep).LIBPATH_list)
3636
end)
37-
push!(eager_mode, :(isdefined($(dep), :eager_mode) && $(dep).eager_mode()))
37+
depmod = getglobal(__module__, dep)
38+
if isdefined(depmod, :eager_mode)
39+
push!(eager_mode, :($(dep).eager_mode()))
40+
end
3841
end
3942
end
4043

4144
return excat(
4245
# This either calls `@artifact_str()`, or returns a constant string if we're overridden.
43-
:(global artifact_dir = find_artifact_dir()),
46+
:(global artifact_dir = find_artifact_dir()::String),
4447

4548
# Add `eager_mode` invocations on all our dependencies
4649
eager_mode...,

0 commit comments

Comments
 (0)