Skip to content

Commit

Permalink
Disallow binaries on non-glibc Linux (#333)
Browse files Browse the repository at this point in the history
  • Loading branch information
ararslan authored Nov 6, 2017
1 parent e691a12 commit 74daea0
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -722,14 +722,16 @@ function check_system_handle!(ret,dep,handle)
end

# Default installation method
if Compat.Sys.isapple()
defaults = [Binaries,PackageManager,SystemPaths,BuildProcess]
elseif Compat.Sys.islinux() || (Compat.Sys.isbsd() && !Compat.Sys.isapple())
defaults = [PackageManager,SystemPaths,Binaries,BuildProcess]
defaults = if Compat.Sys.isbsd()
[Binaries, PackageManager, SystemPaths, BuildProcess]
elseif Compat.Sys.islinux() && glibc_version === nothing # non-glibc
[PackageManager, SystemPaths, BuildProcess]
elseif Compat.Sys.islinux() # glibc
[PackageManager, SystemPaths, Binaries, BuildProcess]
elseif Compat.Sys.iswindows()
defaults = [Binaries,PackageManager,SystemPaths]
[Binaries, PackageManager, SystemPaths]
else
defaults = [SystemPaths,BuildProcess]
[SystemPaths, BuildProcess]
end

function applicable(dep::LibraryDependency)
Expand Down

0 comments on commit 74daea0

Please sign in to comment.