diff -r fc363a3b690a -r 678e1c9eb009 lib/Tools/scala
--- a/lib/Tools/scala	Thu Jul 15 16:35:45 2021 +0200
+++ b/lib/Tools/scala	Thu Jul 15 17:33:06 2021 +0200
@@ -13,6 +13,9 @@
   SCALA_ARGS["${#SCALA_ARGS[@]}"]="-J$ARG"
 done
 
+classpath "$ISABELLE_SETUP_CLASSPATH"
+unset ISABELLE_SETUP_CLASSPATH
+
 [ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
 unset CLASSPATH