[K/N][build] Remove artifact overriding in library task

Depending on noPack option compiler produces file or directory.
Artifact field that contains .klib file can't use @OutputDirectory
annotation. The same applies for @OutputFile with directory.
This commit is contained in:
Pavel Punegov
2021-11-18 11:58:25 +03:00
committed by Space
parent cc7768e38f
commit e3ac2b661a
2 changed files with 1 additions and 6 deletions
+1
View File
@@ -439,6 +439,7 @@ konanArtifacts {
stdlibBuildTask = project.findKonanBuildTask("stdlib", project.platformManager.hostPlatform.target).apply { stdlibBuildTask = project.findKonanBuildTask("stdlib", project.platformManager.hostPlatform.target).apply {
configure { configure {
dependsOn(":kotlin-native:distCompiler") dependsOn(":kotlin-native:distCompiler")
outputs.dir(project.buildDir.resolve("stdlib/$hostName/stdlib"))
} }
} }
} }
@@ -391,12 +391,6 @@ open class KonanCompileFrameworkTask: KonanCompileNativeBinary() {
} }
open class KonanCompileLibraryTask: KonanCompileTask() { open class KonanCompileLibraryTask: KonanCompileTask() {
override val artifact: File
@OutputDirectory get() = destinationDir.resolve(artifactFullName)
override val artifactSuffix: String
@Internal get() = if (!noPack) produce.suffix(konanTarget) else ""
override fun buildCommonArgs() = super.buildCommonArgs().apply { override fun buildCommonArgs() = super.buildCommonArgs().apply {
addKey("-nopack", noPack) addKey("-nopack", noPack)
} }