From 78dcb2c4d5cae7ce56b29664edc0e0fed4cbe473 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 6 Feb 2023 13:55:46 +0100 Subject: [PATCH] Fix compilation with OCaml 4220e2cb9bc2f --- etc/ocaml.rc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/etc/ocaml.rc b/etc/ocaml.rc index da6de03f..76f38702 100644 --- a/etc/ocaml.rc +++ b/etc/ocaml.rc @@ -2,11 +2,9 @@ if [[ -z $OPAMROOT ]] then - - # Comment these lines if you have a system-wide OCaml installation - export PATH="${QP_ROOT}/external/ocaml-bundle/bootstrap/bin:$PATH" - if [[ -f "${QP_ROOT}/external/ocaml-bundle/bootstrap/bin/opam" ]] ; then - eval $(opam env --root "${QP_ROOT}/external/ocaml-bundle/opam" --set-root) + export PATH="${QP_ROOT}/external/opampack/:$PATH" + if [[ -f "${QP_ROOT}/external/opampack/opam" ]] ; then + eval $("${QP_ROOT}/external/opampack/opam" env --root "${QP_ROOT}/external/opampack/opamroot" --set-root) fi fi source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true