Skip to content

Commit 17581d2

Browse files
committed
Tidy up hint usage
CI was using hints through OTHERFLAGS, but normal invocations of the make rules (including the release script) were not.
1 parent d33938a commit 17581d2

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.docker/build/build_funs.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,4 @@ function build_fstar() {
174174
# Some environment variables we want
175175
export V=1 # Make sure to get verbose output from makefiles
176176
export OCAMLRUNPARAM=b
177-
export OTHERFLAGS="--use_hints"
178177
export MAKEFLAGS="$MAKEFLAGS -Otarget" # Group make output by target

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ output-bug-reports:
157157
# snapshot, nor run the build-standalone script.
158158
.PHONY: ci
159159
ci:
160-
+$(Q)OTHERFLAGS="${OTHERFLAGS} --use_hints" FSTAR_HOME=$(CURDIR) $(MAKE) ci-pre
161-
+$(Q)OTHERFLAGS="${OTHERFLAGS} --use_hints" FSTAR_HOME=$(CURDIR) $(MAKE) ci-post
160+
+$(Q)FSTAR_HOME=$(CURDIR) $(MAKE) ci-pre
161+
+$(Q)FSTAR_HOME=$(CURDIR) $(MAKE) ci-post
162162

163163
# This rule runs a CI job in a local container, exactly like is done for
164164
# CI.

examples/Makefile.common

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ CACHE_DIR ?= _cache
4545
ADMIT ?=
4646
MAYBE_ADMIT = $(if $(ADMIT),--admit_smt_queries true)
4747

48+
# Set HINTS= (empty) to not use hints
49+
HINTS ?= 1
50+
MAYBE_HINTS = $(if $(HINTS),--use_hints)
51+
4852
################################################################################
4953
# YOU SHOULDN'T NEED TO TOUCH THE REST
5054
################################################################################
@@ -54,7 +58,7 @@ VERBOSE_FSTAR=$(BENCHMARK_PRE) $(FSTAR) \
5458
--odir $(OUTPUT_DIRECTORY) \
5559
--cache_dir $(CACHE_DIR) \
5660
$(addprefix --include , $(INCLUDE_PATHS)) \
57-
$(OTHERFLAGS) $(MAYBE_ADMIT)
61+
$(OTHERFLAGS) $(MAYBE_ADMIT) $(MAYBE_HINTS)
5862

5963
# As above, but perhaps with --silent, and perhaps with a prefix (usually for monitoring)
6064
MY_FSTAR=$(RUNLIM) $(VERBOSE_FSTAR) $(SIL)

0 commit comments

Comments
 (0)