Fix konan klib output setup

(cherry picked from commit c75b32ed1a4b8de2801bfece680b6ef7778b6dd5)
This commit is contained in:
Roman Artemev
2020-12-25 10:57:38 +03:00
committed by Vasily Levchenko
parent 67fa7c779a
commit 64445bb793
@@ -129,7 +129,8 @@ internal fun produceOutput(context: Context) {
LLVMWriteBitcodeToFile(context.llvmModule!!, output) LLVMWriteBitcodeToFile(context.llvmModule!!, output)
} }
CompilerOutputKind.LIBRARY -> { CompilerOutputKind.LIBRARY -> {
val output = context.config.outputFiles.outputName val nopack = config.getBoolean(KonanConfigKeys.NOPACK)
val output = context.config.outputFiles.klibOutputFileName(!nopack)
val libraryName = context.config.moduleId val libraryName = context.config.moduleId
val shortLibraryName = context.config.shortModuleName val shortLibraryName = context.config.shortModuleName
val neededLibraries = context.librariesWithDependencies val neededLibraries = context.librariesWithDependencies
@@ -146,9 +147,15 @@ internal fun produceOutput(context: Context) {
irVersion = irVersion irVersion = irVersion
) )
val target = context.config.target val target = context.config.target
val nopack = config.getBoolean(KonanConfigKeys.NOPACK)
val manifestProperties = context.config.manifestProperties val manifestProperties = context.config.manifestProperties
if (!nopack) {
val suffix = context.config.outputFiles.produce.suffix(target)
if (!output.endsWith(suffix)) {
error("please specify correct output: packed: ${!nopack}, $output$suffix")
}
}
val library = buildLibrary( val library = buildLibrary(
context.config.nativeLibraries, context.config.nativeLibraries,
context.config.includeBinaries, context.config.includeBinaries,