[K/N] Remove unused targetsWithoutZlib
This commit is contained in:
committed by
Space Team
parent
5a9eea8c45
commit
aead2c2bff
@@ -64,14 +64,6 @@ ext {
|
|||||||
cacheableTargetNames = platformManager.hostPlatform.cacheableTargets
|
cacheableTargetNames = platformManager.hostPlatform.cacheableTargets
|
||||||
cacheableTargets = cacheableTargetNames.collect { platformManager.targetByName(it) }
|
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.
|
// A separate map for each build for automatic cleaning the daemon after the build have finished.
|
||||||
toolClassLoadersMap = new ConcurrentHashMap<Object, URLClassLoader>()
|
toolClassLoadersMap = new ConcurrentHashMap<Object, URLClassLoader>()
|
||||||
}
|
}
|
||||||
@@ -328,9 +320,6 @@ tasks.register("distDef", Copy) {
|
|||||||
from(project(":kotlin-native:platformLibs").file("src/platform/${target.family.name().toLowerCase()}")) {
|
from(project(":kotlin-native:platformLibs").file("src/platform/${target.family.name().toLowerCase()}")) {
|
||||||
into target.visibleName
|
into target.visibleName
|
||||||
include '**/*.def'
|
include '**/*.def'
|
||||||
if (target in targetsWithoutZlib) {
|
|
||||||
exclude '**/zlib.def'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,15 +25,10 @@ plugins {
|
|||||||
id("konan")
|
id("konan")
|
||||||
}
|
}
|
||||||
|
|
||||||
val targetsWithoutZlib: List<KonanTarget> by project
|
|
||||||
|
|
||||||
// region: Util functions.
|
// region: Util functions.
|
||||||
fun KonanTarget.defFiles() =
|
fun KonanTarget.defFiles() =
|
||||||
project.fileTree("src/platform/${family.visibleName}")
|
project.fileTree("src/platform/${family.visibleName}")
|
||||||
.filter { it.name.endsWith(".def") }
|
.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) }
|
.map { DefFile(it, this) }
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user