Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-effekt/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs:
llvm-version:
description: 'LLVM version to install'
required: false
default: '15'
default: '18'
install-dependencies:
description: 'Whether to install system dependencies (Linux only)'
required: false
Expand Down
4 changes: 2 additions & 2 deletions effekt/jvm/src/main/scala/effekt/EffektConfig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ class EffektConfig(args: Seq[String]) extends REPLConfig(args.takeWhile(_ != "--

val llvmVersion: ScallopOption[String] = opt[String](
"llvm-version",
descr = "the llvm version that should be used to compile the generated programs (only necessary if backend is llvm, defaults to 15)",
default = Some(sys.env.getOrElse("EFFEKT_LLVM_VERSION", "15")),
descr = "the llvm version that should be used to compile the generated programs (only necessary if backend is llvm, defaults to 18)",
default = Some(sys.env.getOrElse("EFFEKT_LLVM_VERSION", "18")),
noshort = true,
group = advanced
)
Expand Down
4 changes: 2 additions & 2 deletions effekt/jvm/src/main/scala/effekt/Runner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ object LLVMRunner extends Runner[String] {
override def includes(path: File): List[File] = List(path / ".." / "llvm")

lazy val gccCmd = discoverExecutable(List("cc", "clang", "gcc"), List("--version"))
lazy val llcCmd = discoverExecutable(List("llc", "llc-15", "llc-16"), List("--version"))
lazy val optCmd = discoverExecutable(List("opt", "opt-15", "opt-16"), List("--version"))
lazy val llcCmd = discoverExecutable(List("llc", "llc-18"), List("--version"))
lazy val optCmd = discoverExecutable(List("opt", "opt-18"), List("--version"))

def checkSetup(): Either[String, Unit] =
gccCmd.getOrElseAborting { return Left("Cannot find gcc. This is required to use the LLVM backend.") }
Expand Down