From 206c0cf830d89daf785c537833d2b598c3adecc3 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Thu, 25 Jul 2024 19:25:02 -0700 Subject: [PATCH] docs: document how to compile a statically linked binary on Mac I feel like this is worth documenting, as it shouldn't require Homebrew. --- docs/install-and-setup.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/install-and-setup.md b/docs/install-and-setup.md index 9ebbbb2dc..85b3edd84 100644 --- a/docs/install-and-setup.md +++ b/docs/install-and-setup.md @@ -95,9 +95,33 @@ brew install jj ### Mac -#### From Source +#### From Source, Vendored OpenSSL -You may need to run some or all of these: +You may need to run: + +```shell +xcode-select --install +``` + +Now run either: + +```shell +# To install the *prerelease* version from the main branch +cargo install --git https://github.com/martinvonz/jj.git \ + --features vendored-openssl --locked --bin jj jj-cli +``` + +or: + +```shell +# To install the latest release +cargo install --features vendored-openssl -locked --bin jj jj-cli +``` + +#### From Source, Homebrew OpenSSL + +You will need [Homebrew](https://brew.sh/) installed. You may then need to run +some or all of these: ```shell xcode-select --install