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