Skip to content

Commit

Permalink
Using system path when compiling runtime-compiler-dump-igv
Browse files Browse the repository at this point in the history
  • Loading branch information
JaroslavTulach committed Feb 3, 2025
1 parent 25bc40f commit bd73fcd
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,18 @@ lazy val publishLocalSetting: SettingsDefinition = Seq(
packageSrc / publishArtifact := false
)

def customFrgaalJavaCompilerSettings(targetJdk: String) = {
def customFrgaalJavaCompilerSettings(
targetJdk: String,
useSystemPath: Boolean = false
) = {
var opts = Seq(
"-source",
frgaalSourceLevel,
"--enable-preview"
)
if (useSystemPath) {
opts = opts ++ Seq("-XDignore.symbol.file")
}
// There might be slightly different Frgaal compiler configuration for
// both Compile and Test configurations
Seq(Compile, Test).flatMap { config =>
Expand Down Expand Up @@ -2629,11 +2640,7 @@ def customFrgaalJavaCompilerSettings(targetJdk: String) = {
// accessible from the non-meta build definition.
libraryDependencies += FrgaalJavaCompiler.frgaal,
// Ensure that our tooling uses the right Java version for checking the code.
Compile / javacOptions ++= Seq(
"-source",
frgaalSourceLevel,
"--enable-preview"
)
Compile / javacOptions ++= opts
)
}

Expand Down Expand Up @@ -3441,6 +3448,7 @@ lazy val `runtime-compiler-dump-igv` =
(project in file("engine/runtime-compiler-dump-igv"))
.enablePlugins(JPMSPlugin)
.settings(
customFrgaalJavaCompilerSettings("21", true),
scalaModuleDependencySetting,
javaModuleName := "org.enso.runtime.compiler.dump.igv",
Compile / internalModuleDependencies := {
Expand Down

0 comments on commit bd73fcd

Please sign in to comment.