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.

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

Add FORCE_JULIAINTERFACE_COMPILATION #999

Merged

Conversation

lgoettgens
Copy link
Member

Resolves #997.

I verified by looking at debug output that just running the GAP.jl master uses the jll-version while running julia --proj=override etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "ENV[\"JULIA_DEBUG\"] = all; using GAP" prints [Info: Compiling JuliaInterface...

Copy link

codecov bot commented May 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.75%. Comparing base (c53585e) to head (ad4fd04).

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #999   +/-   ##
=======================================
  Coverage   75.75%   75.75%           
=======================================
  Files          51       51           
  Lines        4190     4190           
=======================================
  Hits         3174     3174           
  Misses       1016     1016           
Files Coverage Δ
src/setup.jl 79.46% <100.00%> (ø)

@@ -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.

@fingolfin fingolfin merged commit 3f3ad31 into oscar-system:master May 27, 2024
14 checks passed
@lgoettgens lgoettgens deleted the lg/FORCE_JULIAINTERFACE_COMPILATION branch May 27, 2024 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using etc/run_with_override.jl should force use of a custom compiled JuliaInterface
2 participants