Skip to content

Commit f5d6f1d

Browse files
committed
Remove redundant bootstrapOptimised setting
1 parent fe9d262 commit f5d6f1d

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

project/Build.scala

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import JmhPlugin.JmhKeys.Jmh
2929
object ExposedValues extends AutoPlugin {
3030
object autoImport {
3131
val bootstrapFromPublishedJars = Build.bootstrapFromPublishedJars
32-
val bootstrapOptimised = Build.bootstrapOptimised
3332
}
3433
}
3534

@@ -90,15 +89,12 @@ object Build {
9089
lazy val dottydoc = inputKey[Unit]("run dottydoc")
9190

9291
lazy val bootstrapFromPublishedJars = settingKey[Boolean]("If true, bootstrap dotty from published non-bootstrapped dotty")
93-
lazy val bootstrapOptimised = settingKey[Boolean]("Bootstrap with -optimise")
9492

9593
// Used in build.sbt
9694
lazy val thisBuildSettings = Def.settings(
9795
// Change this to true if you want to bootstrap using a published non-bootstrapped compiler
9896
bootstrapFromPublishedJars := false,
9997

100-
bootstrapOptimised := false,
101-
10298
// Override `runCode` from sbt-dotty to use the language-server and
10399
// vscode extension from the source repository of dotty instead of a
104100
// published version.
@@ -184,13 +180,6 @@ object Build {
184180
// ...but scala-library is
185181
libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion,
186182

187-
scalacOptions ++= {
188-
if (bootstrapOptimised.value)
189-
Seq("-optimise")
190-
else
191-
Seq()
192-
},
193-
194183
ivyConfigurations ++= {
195184
if (bootstrapFromPublishedJars.value)
196185
Seq(Configurations.ScalaTool)
@@ -232,7 +221,9 @@ object Build {
232221
}
233222
)
234223

235-
lazy val commonOptimisedSettings = commonBootstrappedSettings ++ Seq(bootstrapOptimised := true)
224+
225+
// Bootstrap with -optimise
226+
lazy val commonOptimisedSettings = commonBootstrappedSettings ++ Seq(scalacOptions ++= Seq("-optimise"))
236227

237228
lazy val commonBenchmarkSettings = Seq(
238229
mainClass in (Jmh, run) := Some("dotty.tools.benchmarks.Bench"), // custom main for jmh:run

0 commit comments

Comments
 (0)