Renamed isDefaultLink to isDefaultLibrary.
This commit is contained in:
committed by
alexander-gorshenev
parent
a8c1851534
commit
500492930b
+1
-1
@@ -28,7 +28,7 @@ interface KonanLibraryReader {
|
||||
val linkerOpts: List<String>
|
||||
val unresolvedDependencies: List<String>
|
||||
val escapeAnalysis: ByteArray?
|
||||
val isDefaultLink: Boolean get() = false
|
||||
val isDefaultLibrary: Boolean get() = false
|
||||
val isNeededForLink: Boolean get() = true
|
||||
val manifestProperties: Properties
|
||||
val moduleHeaderData: ByteArray
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ fun SearchPathResolver.resolveImmediateLibraries(libraryNames: List<String>,
|
||||
.map{ LibraryReaderImpl(it, abiVersion, target) }
|
||||
|
||||
val defaultLibraries = defaultLinks(nostdlib = noStdLib, noDefaultLibs = noDefaultLibs).map {
|
||||
LibraryReaderImpl(it, abiVersion, target, isDefaultLink = true)
|
||||
LibraryReaderImpl(it, abiVersion, target, isDefaultLibrary = true)
|
||||
}
|
||||
|
||||
// Make sure the user provided ones appear first, so that
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||
import org.jetbrains.kotlin.konan.target.KonanTarget
|
||||
|
||||
class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
|
||||
val target: KonanTarget? = null, override val isDefaultLink: Boolean = false)
|
||||
val target: KonanTarget? = null, override val isDefaultLibrary: Boolean = false)
|
||||
: KonanLibraryReader {
|
||||
|
||||
// For the zipped libraries inPlace gives files from zip file system
|
||||
@@ -98,5 +98,5 @@ class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
|
||||
|
||||
}
|
||||
|
||||
internal fun <T: KonanLibraryReader> List<T>.purgeUnneeded(): List<T> = this.filter{ !it.isDefaultLink || it.isNeededForLink }
|
||||
internal fun <T: KonanLibraryReader> List<T>.purgeUnneeded(): List<T> = this.filter{ !it.isDefaultLibrary || it.isNeededForLink }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user