summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGuillaume Boisseau2024-05-30 16:13:57 +0200
committerGitHub2024-05-30 16:13:57 +0200
commit0c0bbb56655458510c7573b06c9a6d9910f8138a (patch)
treed112b3f27c257853c368943c3542515b01596d98 /Makefile
parentd6367d464339764d407050bc2c104daf9d6f243c (diff)
parent4195b9653b2d00b846edd3b74211f129192a8806 (diff)
Merge pull request #225 from AeneasVerif/update-charon-pin
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 3 insertions, 8 deletions
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.