changeset 47185 | 300fa46fd081 |
parent 47173 | 08d1724a63e4 |
child 47259 | 2d4ea84278da |
--- a/etc/settings Wed Mar 28 13:38:56 2012 +0200 +++ b/etc/settings Wed Mar 28 13:53:30 2012 +0200 @@ -54,14 +54,6 @@ ### JVM components (Scala or Java) ### -if [ -z "$ISABELLE_JDK_HOME" -a -n "$JAVA_HOME" ]; then - if [ "$(basename "$JAVA_HOME")" = jre -a -e "$(dirname "$JAVA_HOME")"/bin/javac ]; then - ISABELLE_JDK_HOME="$(dirname "$JAVA_HOME")" - else - ISABELLE_JDK_HOME="$JAVA_HOME" - fi -fi - ISABELLE_SCALA_BUILD_OPTIONS="-nowarn -target:jvm-1.5"