Skip to content

Fix show_dlopen_error #596

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

Merged
merged 2 commits into from
Oct 17, 2018
Merged

Fix show_dlopen_error #596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8aa844
Fix show_dlopen_error
tkf Oct 17, 2018
8afbd58
Fix a possible bug in exec_find_libpython
tkf Oct 17, 2018
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: 8 additions & 5 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,19 @@ const dlprefix = Compat.Sys.iswindows() ? "" : "lib"
const PYCALL_DEBUG_BUILD = "yes" == get(ENV, "PYCALL_DEBUG_BUILD", "no")

function exec_find_libpython(python::AbstractString, options)
cmd = `$python $(joinpath(@__DIR__, "find_libpython.py")) $options`
# Do not inline `@__DIR__` into the backticks to expand correctly.
# See: https://github.com/JuliaLang/julia/issues/26323
script = joinpath(@__DIR__, "find_libpython.py")
cmd = `$python $script $options`
if PYCALL_DEBUG_BUILD
cmd = `$cmd --verbose`
end
return readlines(pythonenv(cmd))
end

function show_dlopen_error(e)
function show_dlopen_error(lib, e)
if PYCALL_DEBUG_BUILD
println(stderr, "dlopen($libpath_lib) ==> ", e)
println(stderr, "dlopen($lib) ==> ", e)
# Using STDERR since find_libpython.py prints debugging
# messages to STDERR too.
end
Expand All @@ -75,7 +78,7 @@ function find_libpython(python::AbstractString)
try
return (Libdl.dlopen(lib, dlopen_flags), lib)
catch e
show_dlopen_error(e)
show_dlopen_error(lib, e)
end
end

Expand All @@ -94,7 +97,7 @@ function find_libpython(python::AbstractString)
# compare libpython.
return (libpython, Libdl.dlpath(libpython))
catch e
show_dlopen_error(e)
show_dlopen_error(lib, e)
end
end

Expand Down