more robust: allow empty root (e.g. via symlink);
authorwenzelm
Wed, 20 Mar 2019 17:33:06 +0100
changeset 69924 512ac874bb9d
parent 69923 cd8b6f32ed79
child 69925 c90678ad942d
more robust: allow empty root (e.g. via symlink);
lib/Tools/ocaml_setup
lib/scripts/ocamlc
lib/scripts/ocamlexec
--- a/lib/Tools/ocaml_setup	Tue Mar 19 16:14:59 2019 +0000
+++ b/lib/Tools/ocaml_setup	Wed Mar 20 17:33:06 2019 +0100
@@ -6,7 +6,7 @@
 
 set -e
 
-if [ -d "$ISABELLE_OPAM_ROOT" ]
+if [ -e "$ISABELLE_OPAM_ROOT/config" ]
 then
   isabelle_opam switch "$ISABELLE_OCAML_VERSION"
 else
--- a/lib/scripts/ocamlc	Tue Mar 19 16:14:59 2019 +0000
+++ b/lib/scripts/ocamlc	Wed Mar 20 17:33:06 2019 +0100
@@ -4,7 +4,7 @@
 #
 # Invoke ocamlc via "opam".
 
-if [ -d "$ISABELLE_OPAM_ROOT" ]
+if [ -e "$ISABELLE_OPAM_ROOT/config" ]
 then
   isabelle_opam config exec --switch "$ISABELLE_OCAML_VERSION" -- ocamlc "$@"
 else
--- a/lib/scripts/ocamlexec	Tue Mar 19 16:14:59 2019 +0000
+++ b/lib/scripts/ocamlexec	Wed Mar 20 17:33:06 2019 +0100
@@ -4,7 +4,7 @@
 #
 # Invoke command in OCaml environment setup by "opam".
 
-if [ -d "$ISABELLE_OPAM_ROOT" ]
+if [ -e "$ISABELLE_OPAM_ROOT/config" ]
 then
   isabelle_opam config exec --switch "$ISABELLE_OCAML_VERSION" -- "$@"
 else