summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-07-02 17:04:21 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-07-03 15:23:02 +0200
commita179845fd5fae45cfab714db667fc140985e3a89 (patch)
treefa08557deb5c185affcf2e0bfe83e6264546bca4 /scripts
parent80295ffc260d08592937ce6b27a333b9aedcac4c (diff)
downloadscala-a179845fd5fae45cfab714db667fc140985e3a89.tar.gz
scala-a179845fd5fae45cfab714db667fc140985e3a89.tar.bz2
scala-a179845fd5fae45cfab714db667fc140985e3a89.zip
Enable the new optimizer when building scala
No change in build.sbt, there's no optimizer settings there yet. Ignore the inliner warning in presentation/t7678 and run/t8029.scala, noted in https://issues.scala-lang.org/browse/SI-9378
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/jobs/integrate/bootstrap4
-rwxr-xr-xscripts/jobs/validate/test2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index ccc62c0d45..706a20daf4 100755
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -493,7 +493,7 @@ bootstrap() {
-Dremote.snapshot.repository=NOPE\
-Dremote.release.repository=$releaseTempRepoUrl\
-Drepository.credentials.id=$releaseTempRepoCred\
- -Dscalac.args.optimise=-optimise\
+ -Dscalac.args.optimise=-Yopt:l:classpath\
-Ddocs.skip=1\
-Dlocker.skip=1\
$publishLockerPrivateTask >> $baseDir/logs/builds 2>&1
@@ -533,7 +533,7 @@ bootstrap() {
-Dremote.snapshot.repository=NOPE\
-Dremote.release.repository=$releaseTempRepoUrl\
-Drepository.credentials.id=$releaseTempRepoCred\
- -Dscalac.args.optimise=-optimise\
+ -Dscalac.args.optimise=-Yopt:l:classpath\
$antBuildTask $publishPrivateTask
# clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala
diff --git a/scripts/jobs/validate/test b/scripts/jobs/validate/test
index bedef2e458..d63d39c65d 100755
--- a/scripts/jobs/validate/test
+++ b/scripts/jobs/validate/test
@@ -10,7 +10,7 @@ case $prDryRun in
# build quick using STARR built upstream, as specified by scalaVersion
# (in that sense it's locker, since it was built with starr by that upstream job)
ant -Dstarr.version=$scalaVersion \
- -Dscalac.args.optimise=-optimise \
+ -Dscalac.args.optimise=-Yopt:l:classpath \
-Dlocker.skip=1 -Dextra.repo.url=$prRepoUrl \
$testExtraArgs ${testTarget-test.core docs.done}
;;