azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow IR-less klibs, fix failures when no IR is produced

Browse Source
This commit is contained in:
Sergey Igushkin
2019-12-11 18:01:31 +03:00
parent 2fa1223e93
commit 4f9a60efbc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CompilerOutput.kt
+1 -1
View File
@@ -153,7 +153,7 @@ internal fun produceOutput(context: Context) {
context.config.includeBinaries, context.config.includeBinaries,
neededLibraries, neededLibraries,
context.serializedMetadata!!, context.serializedMetadata!!,
context.serializedIr!!, context.serializedIr,
versions, versions,
target, target,
output, output,
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
+4 -2
View File
@@ -44,7 +44,7 @@ fun buildLibrary(
included: List<String>, included: List<String>,
linkDependencies: List<KonanLibrary>, linkDependencies: List<KonanLibrary>,
metadata: SerializedMetadata, metadata: SerializedMetadata,
ir: SerializedIrModule, ir: SerializedIrModule?,
versions: KotlinLibraryVersioning, versions: KotlinLibraryVersioning,
target: KonanTarget, target: KonanTarget,
output: String, output: String,
@@ -57,7 +57,9 @@ fun buildLibrary(
val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, nopack) val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, nopack)
library.addMetadata(metadata) library.addMetadata(metadata)
library.addIr(ir) if (ir != null) {
library.addIr(ir)
}
natives.forEach { natives.forEach {
library.addNativeBitcode(it) library.addNativeBitcode(it)