From da3edaa7eab2bed17cdfb2c455f2e6b5b0318c4d Mon Sep 17 00:00:00 2001 From: letouzey Date: Sat, 15 Sep 2007 10:35:59 +0000 Subject: * Adding compability with ocaml 3.10 + camlp5 (rework of the patch by S. Mimram) * for detecting architecture, also look for /bin/uname * restore the compatibility of kernel/byterun/coq_interp.c with ocaml 3.07 (caml_modify vs. modify). There is still an issue with this 3.07 and 64-bits architecture (see coqdev and a future bug report). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10122 85f007b7-540e-0410-9357-904b9bb8a0f7 --- dev/ocamldebug-coq.template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dev/ocamldebug-coq.template') diff --git a/dev/ocamldebug-coq.template b/dev/ocamldebug-coq.template index 44680d6d6..2d1c62892 100644 --- a/dev/ocamldebug-coq.template +++ b/dev/ocamldebug-coq.template @@ -7,7 +7,11 @@ export COQLIB=COQLIBDIRECTORY export COQTH=$COQLIB/theories CAMLBIN=CAMLBINDIRECTORY OCAMLDEBUG=$CAMLBIN/ocamldebug -export CAMLP4LIB=`$CAMLBIN/camlp4 -where` +if [ -x "$CAMLBIN/camlp5" ]; then + export CAMLP4LIB=`$CAMLBIN/camlp5 -where` +else + export CAMLP4LIB=`$CAMLBIN/camlp4 -where` +fi exec $OCAMLDEBUG \ -I $CAMLP4LIB \ -- cgit v1.2.3