diff options
| author | Pierre-Marie Pédrot | 2016-11-30 22:47:38 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-11-30 22:47:38 +0100 |
| commit | cf8ecf83b5cc52f7ea73dc1d3af59bf03deff688 (patch) | |
| tree | bd5a6ad80bb09684899fbcc66963d39ae9a9b52a /tools | |
| parent | 88b2eb9279bf5f83f27057094de5b696ee9916e3 (diff) | |
| parent | 3e6fa1cbdc0ec145728089000595b6ea29f37a4c (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 2 | ||||
| -rw-r--r-- | tools/coqc.ml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index ac69a69a4a..eab909f5b1 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -887,7 +887,7 @@ let merlin targets (ml_inc,_,_) = print ".merlin:\n"; print "\t@echo 'FLG -rectypes' > .merlin\n" ; List.iter (fun c -> - printf "\t@echo \"B $(COQLIB) %s\" >> .merlin\n" c) + printf "\t@echo \"B $(COQLIB)%s\" >> .merlin\n" c) lib_dirs ; List.iter (fun (_,c) -> printf "\t@echo \"B %s\" >> .merlin\n" c; diff --git a/tools/coqc.ml b/tools/coqc.ml index b59bbdb1e0..b12d48710f 100644 --- a/tools/coqc.ml +++ b/tools/coqc.ml @@ -94,7 +94,6 @@ let parse_args () = |"-silent"|"-m"|"-xml"|"-v7"|"-v8"|"-beautify"|"-strict-implicit" |"-dont-load-proofs"|"-load-proofs"|"-force-load-proofs" |"-impredicative-set"|"-vm"|"-native-compiler" - |"-verbose-compat-notations"|"-no-compat-notations" |"-indices-matter"|"-quick"|"-type-in-type" |"-async-proofs-always-delegate"|"-async-proofs-never-reopen-branch" as o) :: rem -> |