From 66ab6956bbd80536c5a2bc9c04ca7d34b567efa3 Mon Sep 17 00:00:00 2001 From: Vladimir Lagunov Date: Thu, 29 Aug 2024 09:27:34 +0200 Subject: [PATCH] IJent: allow using WSL JDK when building installers from the monorepo on WSL GitOrigin-RevId: 3b872339c8dde9967973ece6e413c3cae47a3ddc --- .../org/jetbrains/intellij/build/impl/CompilationContextImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt index 393c72cff6da..5811a36fca81 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt @@ -450,7 +450,7 @@ private suspend fun defineJavaSdk(context: CompilationContext) { for ((sdkRef, module) in sdkReferenceToFirstModule) { val sdkName = sdkRef.sdkName val vendorPrefixEnd = sdkName.indexOf('-') - val sdkNameWithoutVendor = if (vendorPrefixEnd == -1) sdkName else sdkName.substring(vendorPrefixEnd + 1) + val sdkNameWithoutVendor = (if (vendorPrefixEnd == -1) sdkName else sdkName.substring(vendorPrefixEnd + 1)).removeSuffix(" (WSL)") check(sdkNameWithoutVendor == "17") { "Project model at ${context.paths.projectHome} [module ${module.name}] requested SDK $sdkNameWithoutVendor, " + "but only '17' is supported as SDK in intellij project"