From aead2c2bff984ab2805b2fdc2ce493cfcbd19b70 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Mon, 4 Mar 2024 23:12:13 +0100 Subject: [PATCH] [K/N] Remove unused targetsWithoutZlib --- kotlin-native/build.gradle | 11 ----------- kotlin-native/platformLibs/build.gradle.kts | 5 ----- 2 files changed, 16 deletions(-) diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index 35ac5df04fc..9af3b1221c6 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -64,14 +64,6 @@ ext { cacheableTargetNames = platformManager.hostPlatform.cacheableTargets cacheableTargets = cacheableTargetNames.collect { platformManager.targetByName(it) } - // Some targets miss zlib in their sysroots. - // We skip these targets when generate a corresponding platform library. - // See also: the :distDef task, targetDefFiles in the :platformLibs project. - targetsWithoutZlib = [ - KonanTarget.LINUX_MIPS32.INSTANCE, - KonanTarget.LINUX_MIPSEL32.INSTANCE - ] - // A separate map for each build for automatic cleaning the daemon after the build have finished. toolClassLoadersMap = new ConcurrentHashMap() } @@ -328,9 +320,6 @@ tasks.register("distDef", Copy) { from(project(":kotlin-native:platformLibs").file("src/platform/${target.family.name().toLowerCase()}")) { into target.visibleName include '**/*.def' - if (target in targetsWithoutZlib) { - exclude '**/zlib.def' - } } } } diff --git a/kotlin-native/platformLibs/build.gradle.kts b/kotlin-native/platformLibs/build.gradle.kts index 8d21f593a7e..286951b6de7 100644 --- a/kotlin-native/platformLibs/build.gradle.kts +++ b/kotlin-native/platformLibs/build.gradle.kts @@ -25,15 +25,10 @@ plugins { id("konan") } -val targetsWithoutZlib: List by project - // region: Util functions. fun KonanTarget.defFiles() = project.fileTree("src/platform/${family.visibleName}") .filter { it.name.endsWith(".def") } - // The libz.a/libz.so and zlib.h are missing in MIPS sysroots. - // Just workaround it until we have sysroots corrected. - .filterNot { (this in targetsWithoutZlib) && it.name == "zlib.def" } .map { DefFile(it, this) }