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

Disable default platform libs for konanc metadata compilation.

Browse Source
This commit is contained in:
Konstantin Tskhovrebov
2020-04-27 14:43:08 +03:00
parent 17ad0a97d8
commit 32e0ce8779
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+2 -5
View File
@@ -100,13 +100,9 @@ private fun FileCollection.filterOutPublishableInteropLibs(project: Project): Fi
* - Only existing files. We don't compile a klib if there are no sources * - Only existing files. We don't compile a klib if there are no sources
* for it (NO-SOURCE check). So we need to take this case into account * for it (NO-SOURCE check). So we need to take this case into account
* and skip libraries that were not compiled. See also: GH-2617 (K/N repo). * and skip libraries that were not compiled. See also: GH-2617 (K/N repo).
*
* - Only external libraries (not stdlib/platform libs). We add stdlib and
* platform libs to dependencies to get an IDE support. But the compiler
* uses them by default so we don't pass them to the compiler explicitly.
*/ */
private fun Collection<File>.filterKlibsPassedToCompiler(project: Project) = filter { private fun Collection<File>.filterKlibsPassedToCompiler(project: Project) = filter {
(it.extension == "klib" || it.isDirectory) && it.exists() && !it.providedByCompiler(project) (it.extension == "klib" || it.isDirectory) && it.exists()
} }
// endregion // endregion
@@ -276,6 +272,7 @@ abstract class AbstractKotlinNativeCompile<T : KotlinCommonToolOptions> : Abstra
add("-Xexpect-actual-linker") add("-Xexpect-actual-linker")
add("-Xmetadata-klib") add("-Xmetadata-klib")
addArg("-manifest", manifestFile.get().absolutePath) addArg("-manifest", manifestFile.get().absolutePath)
add("-no-default-libs")
} }
addArg("-o", outputFile.get().absolutePath) addArg("-o", outputFile.get().absolutePath)