Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FORCE_JULIAINTERFACE_COMPILATION #999

Merged
merged 1 commit into from
May 27, 2024
Merged

Add FORCE_JULIAINTERFACE_COMPILATION #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion etc/run_with_override.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ add_jll_override(tmpdepot, "GAP", gapoverride)
add_jll_override(tmpdepot, "GAP_lib", gapoverride)

# prepend our temporary depot to the depot list...
withenv("JULIA_DEPOT_PATH"=>tmpdepot*":") do
withenv("JULIA_DEPOT_PATH"=>tmpdepot*":", "FORCE_JULIAINTERFACE_COMPILATION" => "true") do

# ... and start Julia, by default with the same project environment
run(`$(Base.julia_cmd()) --project=$(Base.active_project()) $(ARGS)`)
Expand Down
4 changes: 2 additions & 2 deletions src/setup.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,12 @@ function locate_JuliaInterface_so(sysinfo::Dict{String, String})
jll_hash = GitTools.tree_hash(joinpath(jll, "src"))
bundled = joinpath(@__DIR__, "..", "pkg", "JuliaInterface")
bundled_hash = GitTools.tree_hash(joinpath(bundled, "src"))
if jll_hash == bundled_hash
if jll_hash == bundled_hash && get(ENV, "FORCE_JULIAINTERFACE_COMPILATION", "false") != "true"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usually I'd just check for the presence of such a variable and not care about the content. But since this is not intended for user consumption, I am fine either way.

# if the tree hashes match then we can use JuliaInterface.so from the JLL
@debug "Use JuliaInterface.so from GAP_pkg_juliainterface_jll"
path = joinpath(jll, "lib", "gap")
else
# tree hashes differ: we must compile the bundled sources
# tree hashes differ: we must compile the bundled sources (or requested re-compilation via ENV)
path = build_JuliaInterface(sysinfo)
@debug "Use JuliaInterface.so from $(path)"
end
Expand Down
Loading