diff options
| author | Enrico Tassi | 2019-10-22 10:17:57 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2019-10-22 10:17:57 +0200 |
| commit | 23a825c1b02b50991f0bed9e3f71197a46c639a5 (patch) | |
| tree | 38b47cdaefadca1ef6fe180ca9242b9995454813 | |
| parent | 72723186dd179838c9c11b8fcaf3f1f088eddd93 (diff) | |
| parent | 3f5417422b7498514a148242979431aa2990c584 (diff) | |
Merge PR #10886: test-suite/Makefile: work when manually involved for dune-compiled Coq
Reviewed-by: gares
| -rw-r--r-- | test-suite/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test-suite/Makefile b/test-suite/Makefile index c0bdb29fab..c60f39231e 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -32,18 +32,21 @@ include ../Makefile.common # Variables ####################################################################### -# Default value when called from a freshly compiled Coq, but can be -# easily overridden - +ifneq ($(wildcard ../_build),) +BIN:=$(shell cd ..; pwd)/_build/install/default/bin/ +COQLIB:=$(shell cd ..; pwd)/_build/install/default/lib/coq +else BIN := $(shell cd ..; pwd)/bin/ -COQFLAGS?= COQLIB?= ifeq ($(COQLIB),) COQLIB := $(shell ocaml ocaml_pwd.ml ..) endif +endif # exists ../_build export COQLIB +COQFLAGS?= + coqc := $(BIN)coqc -q -R prerequisite TestSuite $(COQFLAGS) coqchk := $(BIN)coqchk -R prerequisite TestSuite coqdoc := $(BIN)coqdoc |