From b629c92391de4f67c3bd089dcec8ec5dc81c4c6e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 5 Sep 2019 23:09:59 -0400 Subject: [PATCH] Fix -XX:MaxPermSize getting emitted for JDK 11 Fixes sbt/sbt#5031 --- src/universal/bin/sbt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt index 81811da46..4bbd3a5d4 100755 --- a/src/universal/bin/sbt +++ b/src/universal/bin/sbt @@ -163,15 +163,12 @@ addMemory () { if [[ -z $java_version ]]; then java_version=$(jdk_version) fi - local class_metadata_opt="MaxPermSize" addJava "-Xms${mem}m" addJava "-Xmx${mem}m" addJava "-Xss4M" addJava "-XX:ReservedCodeCacheSize=${codecache}m" - if [[ (( $java_version < 8 )) ]]; then - addJava "-XX:${class_metadata_opt}=${class_metadata_size}m" - fi + (( $java_version >= 8 )) || addJava "-XX:MaxPermSize=${class_metadata_size}m" } addDefaultMemory() {