azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][test] Fixup target toolchain path for ExecClang

Browse Source 
This fixes failures caused by the 3aeca1956e.
See also MR-KT-12948
This commit is contained in:
Pavel Punegov
2023-11-16 14:53:01 +01:00
committed by Space Team
parent 0aa5170ba2
commit a53c96e790
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecClang.kt
+1 -5
View File
@@ -62,11 +62,7 @@ abstract class ExecClang @Inject constructor(
if (listOf("clang", "clang++").contains(executable)) { if (listOf("clang", "clang++").contains(executable)) {
// TODO: This is copied from `BitcodeCompiler`. Consider sharing the code instead. // TODO: This is copied from `BitcodeCompiler`. Consider sharing the code instead.
val platform = platformManager.platform(target) val platform = platformManager.platform(target)
return if (target.family.isAppleFamily) { return "${platform.absoluteTargetToolchain}/bin/$executable"
"${platform.absoluteTargetToolchain}/usr/bin/$executable"
} else {
"${platform.absoluteTargetToolchain}/bin/$executable"
}
} else { } else {
throw GradleException("unsupported clang executable: $executable") throw GradleException("unsupported clang executable: $executable")
} }