From 9a2ca3c4daaf643d66f82022910ee7dc33a38ebd Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 26 Sep 2022 01:17:12 -0400
Subject: [PATCH] Fix compilation of the intrinsic Scala version

---
 main/src/main/scala/sbt/Defaults.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 962929d4d..d466bb689 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1107,8 +1107,13 @@ object Defaults extends BuildCommon {
           // use the same class loader as the Scala classes used by sbt
           Def.task {
             val allJars = scalaProvider.jars
-            val libraryJars = allJars.filter(_.getName == "scala-library.jar")
-            allJars.filter(_.getName == "scala-compiler.jar") match {
+            val libraryJars = allJars
+              .filter { jar =>
+                (jar.getName == "scala-library.jar") || (jar.getName.startsWith("scala3-library_3"))
+              }
+            (allJars.filter { jar =>
+              jar.getName == "scala-compiler.jar" || jar.getName.startsWith("scala3-compiler_3")
+            }) match {
               case Array(compilerJar) if libraryJars.nonEmpty =>
                 makeScalaInstance(
                   version,