@@ -29,7 +29,6 @@ import JmhPlugin.JmhKeys.Jmh
29
29
object ExposedValues extends AutoPlugin {
30
30
object autoImport {
31
31
val bootstrapFromPublishedJars = Build .bootstrapFromPublishedJars
32
- val bootstrapOptimised = Build .bootstrapOptimised
33
32
}
34
33
}
35
34
@@ -90,15 +89,12 @@ object Build {
90
89
lazy val dottydoc = inputKey[Unit ](" run dottydoc" )
91
90
92
91
lazy val bootstrapFromPublishedJars = settingKey[Boolean ](" If true, bootstrap dotty from published non-bootstrapped dotty" )
93
- lazy val bootstrapOptimised = settingKey[Boolean ](" Bootstrap with -optimise" )
94
92
95
93
// Used in build.sbt
96
94
lazy val thisBuildSettings = Def .settings(
97
95
// Change this to true if you want to bootstrap using a published non-bootstrapped compiler
98
96
bootstrapFromPublishedJars := false ,
99
97
100
- bootstrapOptimised := false ,
101
-
102
98
// Override `runCode` from sbt-dotty to use the language-server and
103
99
// vscode extension from the source repository of dotty instead of a
104
100
// published version.
@@ -184,13 +180,6 @@ object Build {
184
180
// ...but scala-library is
185
181
libraryDependencies += " org.scala-lang" % " scala-library" % scalacVersion,
186
182
187
- scalacOptions ++= {
188
- if (bootstrapOptimised.value)
189
- Seq (" -optimise" )
190
- else
191
- Seq ()
192
- },
193
-
194
183
ivyConfigurations ++= {
195
184
if (bootstrapFromPublishedJars.value)
196
185
Seq (Configurations .ScalaTool )
@@ -232,7 +221,9 @@ object Build {
232
221
}
233
222
)
234
223
235
- lazy val commonOptimisedSettings = commonBootstrappedSettings ++ Seq (bootstrapOptimised := true )
224
+
225
+ // Bootstrap with -optimise
226
+ lazy val commonOptimisedSettings = commonBootstrappedSettings ++ Seq (scalacOptions ++= Seq (" -optimise" ))
236
227
237
228
lazy val commonBenchmarkSettings = Seq (
238
229
mainClass in (Jmh , run) := Some (" dotty.tools.benchmarks.Bench" ), // custom main for jmh:run
0 commit comments