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 --- config/Makefile.template | 4 ---- config/coq_config.mli | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'config') diff --git a/config/Makefile.template b/config/Makefile.template index 6161089ae..651985488 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -79,10 +79,6 @@ CAMLTIMEPROF=COQPROFILEFLAG # The best compiler: native (=opt) or bytecode (=byte) if no native compiler BEST=BESTCOMPILER -# For Camlp4 use -P4=$(COQTOP)/bin/$(ARCH)/call_camlp4 -I $(COQTOP)/src/parsing -P4DEP=$(COQTOP)/bin/$(ARCH)/camlp4dep - # Your architecture # Can be obtain by UNIX command arch ARCH=ARCHITECTURE diff --git a/config/coq_config.mli b/config/coq_config.mli index 6882baa6f..54d92c62c 100644 --- a/config/coq_config.mli +++ b/config/coq_config.mli @@ -18,6 +18,7 @@ val coqtop : string (* where are the sources *) val camldir : string (* base directory of OCaml binaries *) val camllib : string (* for Dynlink *) +val camlp4 : string (* exact name of camlp4: either "camlp4" ou "camlp5" *) val camlp4lib : string (* where is the library of Camlp4 *) val best : string (* byte/opt *) -- cgit v1.2.3