aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-08-14 14:54:56 +0000
committerGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-08-14 14:54:56 +0000
commit60ddeba351613457bf921e1db58d63dd2c9ee64f (patch)
tree2a74a2c44c02c2f8f6524e0bdc4d22f546779a28
parent6af2902ddd8ea6d4171b882726e9bb4d2fc45748 (diff)
Added profile.cmo in grammar.cma so that any functions in one of the
files embedded in grammar.cma can be profiled with the Profile module. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12279 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile.build4
-rw-r--r--config/Makefile.template3
-rw-r--r--parsing/grammar.mllib1
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build
index 60156f509..39df58c17 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -706,10 +706,10 @@ dev/printers.cma: | dev/printers.mllib.d
parsing/grammar.cma: | parsing/grammar.mllib.d
$(SHOW)'Testing $@'
@touch test.ml4
- $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $^ -impl" -impl test.ml4 -o test-grammar
+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) -I $(CAMLLIB) unix.cma $^ -impl" -impl test.ml4 -o test-grammar
@rm -f test-grammar test.*
$(SHOW)'OCAMLC -a $@'
- $(HIDE)$(OCAMLC) $(BYTEFLAGS) $^ -linkall -a -o $@
+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) unix.cma $^ -linkall -a -o $@
# toplevel/mltop.ml4 (ifdef Byte)
diff --git a/config/Makefile.template b/config/Makefile.template
index 6f9fac3c1..4d45f1b4e 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -49,6 +49,9 @@ CAMLP4BIN="CAMLP4BINDIRECTORY"
# Ocaml version number
CAMLVERSION=CAMLTAG
+# Ocaml libraries
+CAMLLIB="CAMLLIBDIRECTORY"
+
# Ocaml .h directory
CAMLHLIB="CAMLLIBDIRECTORY"
diff --git a/parsing/grammar.mllib b/parsing/grammar.mllib
index 9e714352b..4356db844 100644
--- a/parsing/grammar.mllib
+++ b/parsing/grammar.mllib
@@ -1,5 +1,6 @@
Coq_config
+Profile
Pp_control
Pp
Compat