Skip to content

Fix error on NetBSD #256

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix error on NetBSD #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e63d41
Add support for berkeley-unix (seen on NetBSD)
0-wiz-0 Jun 23, 2023
27b5548
Handle NetBSD like Linux in build.
0-wiz-0 Jun 23, 2023
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 bin/env.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -euo pipefail

system=$(uname)
if [[ $system == "Linux" ]]; then
if [[ $system == "Linux" ]] || [[ $system == "NetBSD" ]]; then
ext="so"
elif [[ $system == "Darwin" ]]; then
ext="dylib"
Expand Down
2 changes: 1 addition & 1 deletion core/tsc-dyn-get.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ this to nil."
(pcase system-type
('windows-nt "dll")
('darwin "dylib")
((or 'gnu 'gnu/linux 'gnu/kfreebsd) "so")
((or 'gnu 'gnu/linux 'gnu/kfreebsd 'berkeley-unix) "so")
((or 'ms-dos 'cygwin) (error "Unsupported system-type %s" system-type))
(_ "so")))

Expand Down
2 changes: 1 addition & 1 deletion lisp/tree-sitter-load.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ See `tree-sitter-require'.")
(pcase system-type
;; The CLI tool outputs `.so', but `.dylib' is more sensible on macOS.
('darwin (list ".dylib" ".so"))
('gnu/linux (list ".so"))
((or 'gnu 'gnu/linux 'gnu/kfreebsd 'berkeley-unix) "so")
('windows-nt (list ".dll"))
(_ (error "Unsupported system-type %s" system-type)))
"List of suffixes for shared libraries that define tree-sitter languages.")
Expand Down