diff options
| author | Gaëtan Gilbert | 2020-04-21 19:29:12 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-04-21 19:29:12 +0200 |
| commit | 3b7f9271609bc4a008a1c754fb0cc00d932ec82f (patch) | |
| tree | a8cb337876a2d2958a87cafa12ee463fe762840e | |
| parent | d91f294454ccc0056eb8ca5a95cb1b002724ebc6 (diff) | |
| parent | 0d207dc4dc7d593c422ed81c07a7e1532899e4ec (diff) | |
Merge PR #12082: Fixes #11808: support for test-suite in -byte-only mode
Reviewed-by: SkySkimmer
| -rw-r--r-- | Makefile.build | 4 | ||||
| -rw-r--r-- | configure.ml | 2 | ||||
| -rw-r--r-- | test-suite/Makefile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.build b/Makefile.build index 8a8500ba1a..d705219757 100644 --- a/Makefile.build +++ b/Makefile.build @@ -269,10 +269,6 @@ OPT:= BESTOBJ:=.cmo BESTLIB:=.cma BESTDYN:=.cma - -# needed while booting if non -local -CAML_LD_LIBRARY_PATH := $(PWD)/kernel/byterun:$(CAML_LD_LIBRARY_PATH) -export CAML_LD_LIBRARY_PATH endif define bestobj diff --git a/configure.ml b/configure.ml index eaa0e321b0..282b40db27 100644 --- a/configure.ml +++ b/configure.ml @@ -983,7 +983,7 @@ let config_runtime () = ["-dllib";"-lcoqrun";"-dllpath";("\"" ^ coqtop ^ "/kernel/byterun\"")] | _ -> let ld="CAML_LD_LIBRARY_PATH" in - build_loadpath := sprintf "export %s:='%s/kernel/byterun':$(%s)" ld coqtop ld; + build_loadpath := sprintf "export %s:=%s/kernel/byterun:$(%s)" ld coqtop ld; ["-dllib";"-lcoqrun";"-dllpath";coqlib/"kernel/byterun"] let vmbyteflags = config_runtime () diff --git a/test-suite/Makefile b/test-suite/Makefile index 954a922c8c..dece21885c 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -62,6 +62,10 @@ coqtopbyte := $(BIN)coqtop.byte -q coqc_interactive := $(coqc) -test-mode -async-proofs-cache force coqdep := $(BIN)coqdep +# This is the convention for coq_makefile +OPT=-$(BEST) +export OPT + VERBOSE?= SHOW := $(if $(VERBOSE),@true,@echo) HIDE := $(if $(VERBOSE),,@) |