[Native] Don't use KLIB repositories in generation of platform libs
Don't pass KLIB repositories via '-repo' or '-r' compiler parameters. ^KT-61098
This commit is contained in:
committed by
Space Team
parent
c13c917a8a
commit
f4617f405c
-2
@@ -268,7 +268,6 @@ private fun generateLibrary(
|
|||||||
"-target", target.visibleName,
|
"-target", target.visibleName,
|
||||||
"-def", defFile.absolutePath,
|
"-def", defFile.absolutePath,
|
||||||
"-compiler-option", "-fmodules-cache-path=${tmpDirectory.child("clangModulesCache").absolutePath}",
|
"-compiler-option", "-fmodules-cache-path=${tmpDirectory.child("clangModulesCache").absolutePath}",
|
||||||
"-repo", outputDirectory.absolutePath,
|
|
||||||
"-no-default-libs", "-no-endorsed-libs", "-Xpurge-user-libs", "-nopack",
|
"-no-default-libs", "-no-endorsed-libs", "-Xpurge-user-libs", "-nopack",
|
||||||
"-Xdisable-experimental-annotation",
|
"-Xdisable-experimental-annotation",
|
||||||
*cinteropOptions.additionalArguments.toTypedArray(),
|
*cinteropOptions.additionalArguments.toTypedArray(),
|
||||||
@@ -323,7 +322,6 @@ private fun buildCache(
|
|||||||
val compilerArgs = arrayOf(
|
val compilerArgs = arrayOf(
|
||||||
"-p", cacheKind,
|
"-p", cacheKind,
|
||||||
"-target", target.visibleName,
|
"-target", target.visibleName,
|
||||||
"-repo", outputDirectory.absolutePath,
|
|
||||||
"-Xadd-cache=${outputDirectory.absolutePath}/${def.libraryName}",
|
"-Xadd-cache=${outputDirectory.absolutePath}/${def.libraryName}",
|
||||||
"-Xcache-directory=${cacheDirectory.absolutePath}",
|
"-Xcache-directory=${cacheDirectory.absolutePath}",
|
||||||
*cacheArgs.toTypedArray()
|
*cacheArgs.toTypedArray()
|
||||||
|
|||||||
Reference in New Issue
Block a user