Skip to content

Commit 17fed07

Browse files
committed
Makefile: using FSTAR_EXE and remove FSTAR_HOME
Needs FStarLang/karamel#516
1 parent e905cd8 commit 17fed07

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ VALE_FLAGS= \
6161

6262
# The usual bug with prims.krml
6363
dist/Makefile.basic: $(filter-out %prims.krml,$(ALL_KRML_FILES))
64-
$(KRML) $(KOPTS) $^ -tmpdir dist -skip-compilation \
64+
$(KRML) -fstar $(FSTAR_EXE) $(KOPTS) $^ -tmpdir dist -skip-compilation \
6565
-minimal \
6666
-add-include '"hacl_krmlrenamings.h"' \
6767
-add-include '"krml/internal/target.h"' \

Makefile.include

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
MERKLE_HOME ?= $(realpath .)
22

3+
FSTAR_EXE ?= $(shell which fstar.exe)
34
KRML_HOME ?= $(MERKLE_HOME)/../karamel
45
HACL_HOME ?= $(MERKLE_HOME)/../hacl-star
56

@@ -27,7 +28,7 @@ FSTAR_FLAGS=$(FSTAR_CHILL_FLAGS) \
2728
--already_cached '*,-MerkleTree,-MerkleTree.*,-Lib.RawBuffer' \
2829
--warn_error @241-274 \
2930

30-
FSTAR=$(FSTAR_HOME)/bin/fstar.exe $(FSTAR_FLAGS)
31+
FSTAR=$(FSTAR_EXE) $(FSTAR_FLAGS)
3132

3233
%.fst-in %.fsti-in:
3334
@echo $(FSTAR_CHILL_FLAGS)

0 commit comments

Comments
 (0)