raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Revert "Remove scalac javabootclasspath hack (#28156)" (#28268)

Browse source 
Breaks the JDK 11 nightlies

This reverts commit 2bf43d394c.
This commit is contained in:
Johan Andrén 2019-11-29 13:40:47 +01:00 • committed by Arnout Engelen
parent dbc97fb6f3
commit bfabdebace
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
project/JdkOptions.scala
View file

@ -34,7 +34,13 @@ object JdkOptions extends AutoPlugin {
jdk8home, jdk8home,
fullJavaHomes, fullJavaHomes,
Seq("-target:jvm-1.8"), Seq("-target:jvm-1.8"),
_ => Seq("-release", "8") // '-release 8' is not enough, for some reason we need the 8 rt.jar
// explicitly. To test whether this has the desired effect, compile
// akka-remote and check the invocation of 'ByteBuffer.clear()' in
// EnvelopeBuffer.class with 'javap -c': it should refer to
//""java/nio/ByteBuffer.clear:()Ljava/nio/Buffer" and not
// "java/nio/ByteBuffer.clear:()Ljava/nio/ByteBuffer". Issue #27079
(java8home: File) => Seq("-release", "8", "-javabootclasspath", java8home + "/jre/lib/rt.jar")
) )
def targetJdkJavacOptions(targetSystemJdk: Boolean, jdk8home: Option[File], fullJavaHomes: Map[String, File]): Seq[String] = def targetJdkJavacOptions(targetSystemJdk: Boolean, jdk8home: Option[File], fullJavaHomes: Map[String, File]): Seq[String] =
selectOptions( selectOptions(