Gradle, native: Fix building platform libraries for MIPS

The sysroot for linux_mips doesn't contain one of platform
libs available for Linux (zlib). So we need to put def-files
to the K/N distribution on a per-target basis instead of putting
a single set of def-files for all targets of the same OS.

Corresponding change in the K/N repository:
https://github.com/JetBrains/kotlin-native/pull/4023

This patch take this change into account at the Gradle plugin side.
This commit is contained in:
Ilya Matveev
2020-03-26 13:32:42 +07:00
parent 872b140500
commit 172a45a637
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -181,7 +181,7 @@ extra["versions.kotlinx-collections-immutable"] = "0.3.1"
extra["versions.ktor-network"] = "1.0.1"
if (!project.hasProperty("versions.kotlin-native")) {
extra["versions.kotlin-native"] = "1.4-M2-dev-15039"
extra["versions.kotlin-native"] = "1.4-M2-dev-15076"
}
val intellijUltimateEnabled by extra(project.kotlinBuildProperties.intellijUltimateEnabled)
@@ -32,7 +32,7 @@ internal class PlatformLibrariesGenerator(val project: Project, val konanTarget:
File(distribution.platformLibs(konanTarget)).absoluteFile
private val defDirectory =
File(distribution.platformDefs(konanTarget.family)).absoluteFile
File(distribution.platformDefs(konanTarget)).absoluteFile
private val shouldBuildCaches: Boolean =
CacheBuilder.cacheWorksFor(konanTarget) && project.konanCacheKind != NativeCacheKind.NONE
@@ -91,7 +91,7 @@ class Distribution(
fun runtime(target: KonanTarget) = runtimeFileOverride ?: "$stdlibDefaultComponent/targets/${target.visibleName}/native/runtime.bc"
fun platformDefs(family: Family) = "$konanHome/konan/platformDef/${family.visibleName}"
fun platformDefs(target: KonanTarget) = "$konanHome/konan/platformDef/${target.visibleName}"
fun platformLibs(target: KonanTarget) = "$klib/platform/${target.visibleName}"