[Libguestfs] [PATCH 3/3] ocaml: Use -safe-string option in OCaml >= 4.02.

Richard W.M. Jones rjones at redhat.com
Wed Jun 15 11:46:12 UTC 2016


In a follow up to the previous commit, enable the -safe-string option
when we detect the version of the compiler which supports this option.
---
 m4/guestfs_ocaml.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4
index 62a06fc..1bed677 100644
--- a/m4/guestfs_ocaml.m4
+++ b/m4/guestfs_ocaml.m4
@@ -125,10 +125,12 @@ EOF
     OCAML_GENERATOR_BYTES_COMPAT_CMO='$(top_builddir)/generator/bytes.cmo'
     OCAML_BYTES_COMPAT_CMO='$(top_builddir)/mllib/bytes.cmo'
     OCAML_BYTES_COMPAT_ML='$(top_builddir)/mllib/bytes.ml'
+    safe_string_option=
 ],[
     OCAML_GENERATOR_BYTES_COMPAT_CMO=
     OCAML_BYTES_COMPAT_CMO=
     OCAML_BYTES_COMPAT_ML=
+    safe_string_option="-safe-string"
 ])
 AC_SUBST([OCAML_GENERATOR_BYTES_COMPAT_CMO])
 AC_SUBST([OCAML_BYTES_COMPAT_CMO])
@@ -137,5 +139,5 @@ AC_SUBST([OCAML_BYTES_COMPAT_ML])
 dnl Flags we want to pass to every OCaml compiler call.
 OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX-3"
 AC_SUBST([OCAML_WARN_ERROR])
-OCAML_FLAGS="-g -annot"
+OCAML_FLAGS="-g -annot $safe_string_option"
 AC_SUBST([OCAML_FLAGS])
-- 
2.7.4




More information about the Libguestfs mailing list