aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--config/Makefile.template3
-rw-r--r--scripts/coqmktop.ml2
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index fd8e52c83..45ae6c8c9 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ LOCALINCLUDES=-I config -I tools -I tools/coqdoc \
MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB)
-BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG)
-OPTFLAGS=$(MLINCLUDES) $(CAMLTIMEPROF) -noassert
+BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG) $(USERFLAGS)
+OPTFLAGS=$(MLINCLUDES) $(CAMLTIMEPROF) $(USERFLAGS) -noassert
OCAMLDEP=ocamldep
DEPFLAGS=$(LOCALINCLUDES)
@@ -1696,5 +1696,6 @@ devel:
clean::
find . -name "\.#*" -exec rm -f {} \;
find . -name "*~" -exec rm -f {} \;
+ find . -name "*.annot" -exec rm -f {} \;
###########################################################################
diff --git a/config/Makefile.template b/config/Makefile.template
index f30ed2114..aa7f2d621 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -60,6 +60,9 @@ CAMLMKTOP=ocamlmktop
# Compilation debug flag
CAMLDEBUG=COQDEBUGFLAG
+# User compilation flag
+USERFLAGS=
+
# Compilation profile flag
CAMLTIMEPROF=COQPROFILEFLAG
diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml
index 784bbdc3d..b57361a43 100644
--- a/scripts/coqmktop.ml
+++ b/scripts/coqmktop.ml
@@ -166,7 +166,7 @@ let parse_args () =
parse ((List.rev(List.flatten (List.map (fun d -> ["-I";d])
(all_subdirs a))))@op,fl) rem
| "-R" :: [] -> usage ()
- | ("-noassert"|"-compact"|"-g"|"-p"|"-thread" as o) :: rem ->
+ | ("-noassert"|"-compact"|"-g"|"-p"|"-thread"|"-dtypes" as o) :: rem ->
parse (o::op,fl) rem
| ("-h"|"--help") :: _ -> usage ()
| f :: rem ->