--- a/lib/Tools/scalac Mon Mar 26 15:33:28 2012 +0200
+++ b/lib/Tools/scalac Mon Mar 26 17:58:47 2012 +0200
@@ -4,10 +4,8 @@
#
# DESCRIPTION: invoke Scala compiler within the Isabelle environment
-[ -z "$SCALA_HOME" ] && { echo "Unknown SCALA_HOME -- Scala unavailable"; exit 2; }
-
[ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
CLASSPATH="$(jvmpath "$CLASSPATH")"
-exec "$SCALA_HOME/bin/scalac" -Dfile.encoding=UTF-8 \
+isabelle_scala scalac -Dfile.encoding=UTF-8 \
"-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"