From 172a45a637909344f3a55e13a97d607a2ee1c4f5 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 26 Mar 2020 13:32:42 +0700
Subject: [PATCH] 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.
---
 build.gradle.kts                                                | 2 +-
 .../targets/native/internal/PlatformLibrariesGenerator.kt       | 2 +-
 .../utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index adaa3cb49d9..9ce1c752d50 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/PlatformLibrariesGenerator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/PlatformLibrariesGenerator.kt
index 4177e5f8b5b..62b46bfa230 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/PlatformLibrariesGenerator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/PlatformLibrariesGenerator.kt
@@ -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
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
index 40be6d46c12..5245f66ee9e 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
@@ -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}"