luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix -XX:MaxPermSize getting emitted for JDK 11 

Fixes sbt/sbt#5031
This commit is contained in:
Eugene Yokota 2019-09-05 23:09:59 -04:00
parent 91b71b39d3
commit b629c92391
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/universal/bin/sbt
View File

@ -163,15 +163,12 @@ addMemory () {
if [[ -z $java_version ]]; then if [[ -z $java_version ]]; then
java_version=$(jdk_version) java_version=$(jdk_version)
fi fi
local class_metadata_opt="MaxPermSize"
addJava "-Xms${mem}m" addJava "-Xms${mem}m"
addJava "-Xmx${mem}m" addJava "-Xmx${mem}m"
addJava "-Xss4M" addJava "-Xss4M"
addJava "-XX:ReservedCodeCacheSize=${codecache}m" addJava "-XX:ReservedCodeCacheSize=${codecache}m"
if [[ (( $java_version < 8 )) ]]; then (( $java_version >= 8 )) || addJava "-XX:MaxPermSize=${class_metadata_size}m"
addJava "-XX:${class_metadata_opt}=${class_metadata_size}m"
fi
} }
addDefaultMemory() { addDefaultMemory() {