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

[K/N] Fix defFileDependencies

Browse Source
This commit is contained in:
Sergey Bogolepov
2022-08-26 10:24:58 +03:00
parent 5f847ac40d
commit dde1dcc760
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt
+6 -1
View File
@@ -1,6 +1,8 @@
package org.jetbrains.kotlin.native.interop.gen package org.jetbrains.kotlin.native.interop.gen
import kotlinx.cinterop.usingJvmCInteropCallbacks
import org.jetbrains.kotlin.konan.util.DefFile import org.jetbrains.kotlin.konan.util.DefFile
import org.jetbrains.kotlin.konan.util.usingNativeMemoryAllocator
import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform
import org.jetbrains.kotlin.native.interop.gen.jvm.buildNativeLibrary import org.jetbrains.kotlin.native.interop.gen.jvm.buildNativeLibrary
import org.jetbrains.kotlin.native.interop.gen.jvm.prepareTool import org.jetbrains.kotlin.native.interop.gen.jvm.prepareTool
@@ -31,9 +33,12 @@ fun defFileDependencies(args: Array<String>, runFromDaemon: Boolean) {
} }
} }
} }
usingNativeMemoryAllocator {
usingJvmCInteropCallbacks {
defFileDependencies(makeDependencyAssigner(targets, defFiles, runFromDaemon)) defFileDependencies(makeDependencyAssigner(targets, defFiles, runFromDaemon))
} }
}
}
private fun makeDependencyAssigner(targets: List<String>, defFiles: List<File>, runFromDaemon: Boolean) = private fun makeDependencyAssigner(targets: List<String>, defFiles: List<File>, runFromDaemon: Boolean) =
CompositeDependencyAssigner(targets.map { makeDependencyAssignerForTarget(it, defFiles, runFromDaemon) }) CompositeDependencyAssigner(targets.map { makeDependencyAssignerForTarget(it, defFiles, runFromDaemon) })