diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt index dc21c6cacdb..535ae78b6d0 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt @@ -378,7 +378,7 @@ private fun processCLib(flavorName: String, cinteropArguments: CInteropArguments dependencies = stdlibDependency + imports.requiredLibraries.toList(), nopack = cinteropArguments.nopack, shortName = cinteropArguments.shortModuleName, - staticLibraries = staticLibraries + staticLibraries = resolveLibraries(staticLibraries, libraryPaths) ) return null } diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 1c4a81c8c9c..4d247de9f79 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -3576,8 +3576,8 @@ createInterop("embedStaticLibraries") { } } - it.extraOpts '-staticLibrary', "$libDir/1.a" - it.extraOpts '-staticLibrary', "$libDir/2.a" + it.extraOpts '-staticLibrary', "1.a" + it.extraOpts '-staticLibrary', "2.a" } if (PlatformInfo.isAppleTarget(project)) { diff --git a/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def b/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def index 686ec63efd0..bd6d7b82b73 100644 --- a/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def +++ b/backend.native/tests/interop/embedStaticLibraries/embedStaticLibraries.def @@ -1,3 +1,2 @@ -staticLibraries = \ - backend.native/tests/build/embedStaticLibraries/3.a \ - backend.native/tests/build/embedStaticLibraries/4.a +libraryPaths = backend.native/tests/build/embedStaticLibraries +staticLibraries = 3.a 4.a