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

Native klib testing: a binary compatibility tweak.

Browse Source 
Link versioned libraries against dependencies of the same version.
This commit is contained in:
Alexander Gorshenev
2021-03-30 10:18:57 +03:00
committed by Space
parent 4d2e3a2379
commit 7d13aaad24
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/MultiModule.kt
+2 -3
View File
@@ -38,8 +38,7 @@ class MultiModuleCompilerInvocations(
val klibModulePath = moduleToKlibName(module.name, moduleVersion)
libs.addAll(module.dependencies)
// When producing klibs link them against version 1 of multiversioned klibs.
val dependencyVersion = 1
val dependencyVersion = moduleVersion
val klibs = module.dependencies.flatMap { listOf("-l", moduleToKlibName(it, dependencyVersion)) }
val repos = listOf("-r", "${executablePath}_version$dependencyVersion", "-r", outputDirectory)
@@ -68,7 +67,7 @@ class MultiModuleCompilerInvocations(
libs.addAll(f.module.dependencies)
}
// When producing klibs link them against version 2 of multiversioned klibs.
// When producing an executable link them against version 2 of multiversioned klibs.
val dependencyVersion = 2
val friends = compileMain.flatMap { it.module.friends }.toSet()