summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-07-13 12:01:37 -0400
committerSeth Tisue <seth@tisue.net>2015-07-13 12:01:37 -0400
commit05cf32c55f6c8b74920a8a059831e9593e3ab233 (patch)
tree1cbb0f41ae8ece076b250a7f2077b8ac6f2d8dce
parent02c3bac0b2c534ff8a8bbdb544034bf68a0be334 (diff)
downloadscala-05cf32c55f6c8b74920a8a059831e9593e3ab233.tar.gz
scala-05cf32c55f6c8b74920a8a059831e9593e3ab233.tar.bz2
scala-05cf32c55f6c8b74920a8a059831e9593e3ab233.zip
remove -XX:MaxPermSize=128M; it doesn't exist in Java 8
-rw-r--r--README.md2
-rwxr-xr-xtest/partest3
2 files changed, 2 insertions, 3 deletions
diff --git a/README.md b/README.md
index 0cc7e98b0e..fc73de2273 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ We typically alias `build/quick/bin/scalac -d sandbox` to `qsc` and `build/quick
Note: on most machines this requires more heap than is allocate by default. You can adjust the parameters with ANT_OPTS. Example command line:
```
-ANT_OPTS = "-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
+ANT_OPTS = "-Xms512M -Xmx2048M -Xss1M" ant docs
```
- `ant dist` builds a distribution in 'dists/latest'.
diff --git a/test/partest b/test/partest
index f396459c6d..7e19c92165 100755
--- a/test/partest
+++ b/test/partest
@@ -117,8 +117,7 @@ fi
# last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the
# supplied argument will be used.
-# At this writing it is reported test/partest --all requires 108m permgen.
-JAVA_OPTS="-Xmx1024M -Xms64M -XX:MaxPermSize=128M $JAVA_OPTS"
+JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS"
# the ant task doesn't supply any options by default,
# so don't do that here either -- note that you may want to pass -optimise