From 4195b9653b2d00b846edd3b74211f129192a8806 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 30 May 2024 15:36:08 +0200 Subject: Update charon pin to local commit when developing --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b27fe0de..1e832378 100644 --- a/Makefile +++ b/Makefile @@ -81,16 +81,11 @@ build-bin-dir: build-bin build-lib build-runner doc: cd compiler && dune build @doc -# Fetches the latest commit from charon and updates `flake.lock` accordingly. +# Updates `flake.lock` and `charon-pin` with the latest commit from Charon. If +# we're using a symlink, this takes the commit from our local charon. .PHONY: update-charon-pin update-charon-pin: - nix flake lock --update-input charon - $(MAKE) charon-pin - -# Keep the commit revision in `./charon-pin` as well so that non-nix users can -# know which commit to use. -./charon-pin: flake.lock - ./scripts/update-charon-pin.sh >> ./charon-pin + ./scripts/update-charon-pin.sh # Checks that `./charon` contains a clone of charon at the required commit. # Also checks that `./charon/bin/charon` exists. -- cgit v1.2.3