From 41477b25a1b52d99f0415c399e954cbbe3352737 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 16 Nov 2023 17:46:20 +0100 Subject: [PATCH] [K/N][test] Fixup target toolchain path for swift compilation Use a parent path in fallback framework path environment variable. This fixes failures caused by the 3aeca1956e1a. See also MR-KT-12948 --- .../build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt index a935b12c900..f98a10de0eb 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt @@ -17,11 +17,9 @@ import org.jetbrains.kotlin.konan.properties.propertyList import org.jetbrains.kotlin.konan.properties.saveProperties import org.jetbrains.kotlin.konan.target.* import java.io.File -import java.util.concurrent.TimeUnit import java.nio.file.Path import org.jetbrains.kotlin.konan.file.File as KFile import org.gradle.api.tasks.TaskProvider -import java.util.* import kotlin.collections.HashSet /** @@ -307,7 +305,7 @@ fun compileSwift( val (stdOut, stdErr, exitCode) = runProcess( executor = localExecutor(project), executable = compiler, args = args, - env = mapOf("DYLD_FALLBACK_FRAMEWORK_PATH" to configs.absoluteTargetToolchain + "/ExtraFrameworks") + env = mapOf("DYLD_FALLBACK_FRAMEWORK_PATH" to File(configs.absoluteTargetToolchain).parent + "/ExtraFrameworks") ) println(