From fac07f7168c388f3cb1e3934b1d3645de87c4f90 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Mon, 7 Oct 2019 16:10:10 +0300 Subject: [PATCH] Fix toolchain path used by the bitcode-build-tool --- .../src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt index cd8daf50196..1176603787d 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt @@ -160,7 +160,7 @@ open class FrameworkTest : DefaultTask() { val configurables = project.platformManager.platform(testTarget).configurables as AppleConfigurables val bitcodeBuildTool = Paths.get("${configurables.absoluteAdditionalToolsDir}/bin/bitcode-build-tool") - val ldPath = "${configurables.absoluteTargetToolchain}/usr/bin/ld" + val toolPath = "${configurables.absoluteTargetToolchain}/usr/bin/" val sdk = when (testTarget) { KonanTarget.IOS_X64, KonanTarget.TVOS_X64, @@ -175,6 +175,6 @@ open class FrameworkTest : DefaultTask() { else -> error("Cannot validate bitcode for test target $testTarget") } - runTest(bitcodeBuildTool, args = listOf("--sdk", sdk, "-v", "-t", ldPath, frameworkBinary)) + runTest(bitcodeBuildTool, args = listOf("--sdk", sdk, "-v", "-t", toolPath, frameworkBinary)) } } \ No newline at end of file