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

Fix toolchain path used by the bitcode-build-tool

Browse Source
This commit is contained in:
Pavel Punegov
2019-10-07 16:10:10 +03:00
committed by Pavel Punegov
parent 67ba24411f
commit fac07f7168
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/kotlin/org/jetbrains/kotlin/FrameworkTest.kt
+2 -2
View File
@@ -160,7 +160,7 @@ open class FrameworkTest : DefaultTask() {
val configurables = project.platformManager.platform(testTarget).configurables as AppleConfigurables val configurables = project.platformManager.platform(testTarget).configurables as AppleConfigurables
val bitcodeBuildTool = Paths.get("${configurables.absoluteAdditionalToolsDir}/bin/bitcode-build-tool") 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) { val sdk = when (testTarget) {
KonanTarget.IOS_X64, KonanTarget.IOS_X64,
KonanTarget.TVOS_X64, KonanTarget.TVOS_X64,
@@ -175,6 +175,6 @@ open class FrameworkTest : DefaultTask() {
else -> error("Cannot validate bitcode for test target $testTarget") 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))
} }
} }