From a53c96e7907c44400175f8a355f507663dfb53ef Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 16 Nov 2023 14:53:01 +0100 Subject: [PATCH] [K/N][test] Fixup target toolchain path for ExecClang This fixes failures caused by the 3aeca1956e1a. See also MR-KT-12948 --- .../src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt index f9b29f98964..efcc134f3d9 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt @@ -62,11 +62,7 @@ abstract class ExecClang @Inject constructor( if (listOf("clang", "clang++").contains(executable)) { // TODO: This is copied from `BitcodeCompiler`. Consider sharing the code instead. val platform = platformManager.platform(target) - return if (target.family.isAppleFamily) { - "${platform.absoluteTargetToolchain}/usr/bin/$executable" - } else { - "${platform.absoluteTargetToolchain}/bin/$executable" - } + return "${platform.absoluteTargetToolchain}/bin/$executable" } else { throw GradleException("unsupported clang executable: $executable") }