From 9836fce77573a6f577f18104874f81cd8e484956 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 10 Mar 2020 10:05:43 +0100
Subject: [PATCH] [dev] switch to camlp5
---
Makefile | 2 +-
Makefile.config.in | 2 +-
configure.ac | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index ccdb78c..c14bf58 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ dontrun:
$(Frama_Clang_DIR)/gen_ast: $(PLUGIN_DIR)/gen_ast.ml
$(PRINT_OCAMLC) $@
- $(OCAMLC) $(Frama_Clang_BFLAGS) -o $@ -pp $(CAMLP4O) \
+ $(OCAMLC) $(Frama_Clang_BFLAGS) -o $@ -pp $(CAMLP5O) \
zarith.cma dynlink.cma transitioning.cmo $^
$(Frama_Clang_DIR)/test_ast: \
diff --git a/Makefile.config.in b/Makefile.config.in
index df86b93..fdc86b2 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -21,7 +21,7 @@
##########################################################################
ENABLE_FRAMA_CLANG=@ENABLE_FRAMA_CLANG@
-CAMLP4O=@CAMLP4O@
+CAMLP5O=@CAMLP5O@
CXX=@CXX@
CLANG_CXXFLAGS=@CLANG_CXXFLAGS@
CLANG_CFLAGS=@CLANG_CFLAGS@
diff --git a/configure.ac b/configure.ac
index aecc826..a903c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,14 +36,14 @@ m4_ifndef([FRAMAC_M4_MACROS],
check_plugin([frama_clang],PLUGIN_RELATIVE_PATH(plugin_file),
[C++ front-end for Frama-C],yes)
-plugin_require_external(frama_clang,camlp4o)
+plugin_require_external(frama_clang,camlp5o)
# check for system C++ compiler, as we can't rely on clang++ itself because
# of potential incompatibilities with GNU libstdc++ v5.
# See https://llvm.org/bugs/show_bug.cgi?id=23529 for more details
AC_PROG_CXX()
-configure_tool([CAMLP4O],[camlp4o],[camlp4o not found.],no)
+configure_tool([CAMLP5O],[camlp5o],[camlp5o not found.],no)
check_plugin_dependencies()
AC_SUBST(CLANG_CXXFLAGS)
--
GitLab