--- a/Admin/build Thu Jul 15 19:51:01 2021 +0200
+++ b/Admin/build Thu Jul 15 20:11:23 2021 +0200
@@ -70,7 +70,7 @@
"$ISABELLE_HOME/lib/classes/Pure.jar" \
"$ISABELLE_HOME/lib/classes/Pure.shasum" \
"$ISABELLE_HOME/src/Tools/jEdit/dist"
- "$ISABELLE_TOOL" java isabelle.setup.Setup "$@"
+ env ISABELLE_SETUP_CLASSPATH_SKIP=true "$ISABELLE_TOOL" java isabelle.setup.Setup "$@"
}
--- a/lib/Tools/java Thu Jul 15 19:51:01 2021 +0200
+++ b/lib/Tools/java Thu Jul 15 20:11:23 2021 +0200
@@ -6,7 +6,11 @@
eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
-classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
+if [ -z "$ISABELLE_SETUP_CLASSPATH_SKIP" -o "$ISABELLE_SETUP_CLASSPATH_SKIP" = "false" ]
+then
+ classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
+fi
+
classpath "$CLASSPATH"; unset CLASSPATH
isabelle_java java "${JAVA_ARGS[@]}" \