blob: 9115a9810f67eca45fba3f0f47b47cf64c11b5ce (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- scala-2.12.1-orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-05 20:45:09.000000000 +1100
+++ scala-2.12.1/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-28 11:46:29.120052198 +1100
@@ -197,14 +197,11 @@
# to java to suppress "." from materializing.
if [[ "$usebootcp" == "true" ]]; then
classpath_args=("-Xbootclasspath/a:$TOOL_CLASSPATH" -classpath "\"\"")
- # Note that the version numbers go 1.7, 1.8, 9, 10, ...
- java_release="$(cat $JAVA_HOME/release | grep JAVA_VERSION)"
- if [[ ! "$java_release" =~ JAVA_VERSION=\"1\. ]]; then
- # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see
- # the appended boot classpath (jdk.boot.class.path.append) is not visible.
- # So we have to pass a custom system property that PathResolver will find.
- classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH")
- fi
+ # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see
+ # the appended boot classpath (jdk.boot.class.path.append) is not visible.
+ # So we have to pass a custom system property that PathResolver will find.
+ # We do this for all JVM versions, rather than getting into the business of JVM version detection.
+ classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH")
else
classpath_args=(-classpath "$TOOL_CLASSPATH")
fi
|
