diff -r fc363a3b690a -r 678e1c9eb009 lib/Tools/scalac
--- a/lib/Tools/scalac	Thu Jul 15 16:35:45 2021 +0200
+++ b/lib/Tools/scalac	Thu Jul 15 17:33:06 2021 +0200
@@ -6,5 +6,11 @@
 
 isabelle_admin_build jars || exit $?
 
+classpath "$ISABELLE_SETUP_CLASSPATH"
+unset ISABELLE_SETUP_CLASSPATH
+
+[ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
+unset CLASSPATH
+
 isabelle_scala scalac -Dfile.encoding=UTF-8 \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"