Skip to content

Add a compatibility Makefile stub #531

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
cpu merged 2 commits into from
Jan 22, 2025
+27 −1
Merged

Add a compatibility Makefile stub #531

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
8ee15f8
Cargo: clarify TODO for tree-sitter update
cpu Jan 20, 2025
dfbc0eb
Add a compatibility Makefile stub
cpu Jan 20, 2025
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
5 changes: 4 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ hickory-resolver = { version = "=0.25.0-alpha.4", features = ["dns-over-https-ru
tokio = { version = "1.43.0", features = ["io-util", "macros", "net", "rt"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tree-sitter = "0.23" # TODO(@cpu): handle breaking API changes for 0.24
# TODO(@cpu): handle breaking API changes for tree-sitter 0.24.
# This is blocked on a tree-sitter-md release for the tree-sitter 0.24 update
# presently unreleased on upstream main.
tree-sitter = "0.23"
tree-sitter-c = "0.23"
tree-sitter-md = "0.3"
23 changes: 23 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This Makefile exists exclusively as a convenience for users previously relying on the
# rustls-ffi Makefile for Linux/MacOS builds.
#
# GNU make is **not** required to build librustls and in most circumstances you are better off
# using cargo-c directly. See the README.md for more information.

CARGO ?= cargo
DESTDIR ?= /usr/local

all: install

check-cargo-c:
@if ! ${CARGO} capi --version >/dev/null 2>&1; then \
printf "%s" "Error: cargo-c is not installed. Install it with 'cargo install cargo-c' " && \
printf "%s\n" "or download a binary release from https://github.com/lu-zero/cargo-c/releases/"; \
exit 1; \
fi

# NOTE: If you wish to customize library features, or build in debug mode, you should use cargo-c directly.
install: check-cargo-c
${CARGO} capi install --release --libdir lib --prefix=${DESTDIR}

.PHONY: all install check-cargo-c
Loading