Skip to content

fix some OS checks for FreeBSD #1080

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

Open
KristofferC wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix some OS checks for FreeBSD #1080

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
6 changes: 3 additions & 3 deletions src/PackageCompiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ end
function glob_pattern_lib(lib)
Sys.iswindows() ? lib * "*.dll" :
Sys.isapple() ? lib * "*.dylib" :
Sys.islinux() ? lib * "*.so*" :
(Sys.islinux() || Sys.isbsd()) ? lib * "*.so*" :
error("unknown os")
end

Expand Down Expand Up @@ -1394,7 +1394,7 @@ function bundle_julia_libraries(dest_dir, stdlibs)

# Required libraries
println(" ├── Base:")
os = Sys.islinux() ? "linux" : Sys.isapple() ? "mac" : "windows"
os = Sys.isapple() ? "mac" : (Sys.islinux() || Sys.isbsd()) ? "linux" : "windows"
for lib in required_libraries[os]
if Sys.islinux() && lib == "libstdc++"
matches = libstdcxx
Expand Down Expand Up @@ -1429,7 +1429,7 @@ function bundle_julia_libraries(dest_dir, stdlibs)
major, minor, patch = VERSION.major, VERSION.minor, VERSION.patch
r = if Sys.isapple()
Regex("^libjulia(\\.$major(\\.$minor(\\.$patch)?)?)?\\.dylib\$")
elseif Sys.islinux()
elseif Sys.islinux() || Sys.isbsd()
Regex("^libjulia\\.so(\\.$major(\\.$minor(\\.$patch)?)?)?\$")
elseif Sys.iswindows()
Regex("^libjulia\\.dll\$")
Expand Down
6 changes: 3 additions & 3 deletions src/juliaconfig.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ function ldflags()
if Sys.iswindows()
fl = fl * " -Wl,--stack,8388608"
fl = fl * " -Wl,--export-all-symbols"
elseif Sys.islinux()
elseif Sys.islinux() || (Sys.isbsd() && !Sys.isapple())
fl = fl * " -Wl,--export-dynamic"
end
return fl
end

function ldlibs()
libnames = isdebugbuild() ? "-ljulia-debug -ljulia-internal-debug" :
libnames = isdebugbuild() ? "-ljulia-debug -ljulia-internal-debug" :
"-ljulia -ljulia-internal"
if Sys.islinux()
if Sys.islinux() || (Sys.isbsd() && !Sys.isapple())
return "-Wl,-rpath-link,$(shell_escape(julia_libdir())) -Wl,-rpath-link,$(shell_escape(julia_private_libdir())) $libnames"
elseif Sys.iswindows()
return "$libnames -lopenlibm"
Expand Down
Loading