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

Renamed isDefaultLink to isDefaultLibrary.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-10-20 15:46:26 +03:00
committed by alexander-gorshenev
parent a8c1851534
commit 500492930b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibraryReader.kt
+1 -1
View File
@@ -28,7 +28,7 @@ interface KonanLibraryReader {
val linkerOpts: List<String> val linkerOpts: List<String>
val unresolvedDependencies: List<String> val unresolvedDependencies: List<String>
val escapeAnalysis: ByteArray? val escapeAnalysis: ByteArray?
val isDefaultLink: Boolean get() = false val isDefaultLibrary: Boolean get() = false
val isNeededForLink: Boolean get() = true val isNeededForLink: Boolean get() = true
val manifestProperties: Properties val manifestProperties: Properties
val moduleHeaderData: ByteArray val moduleHeaderData: ByteArray
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt
+1 -1
View File
@@ -52,7 +52,7 @@ fun SearchPathResolver.resolveImmediateLibraries(libraryNames: List<String>,
.map{ LibraryReaderImpl(it, abiVersion, target) } .map{ LibraryReaderImpl(it, abiVersion, target) }
val defaultLibraries = defaultLinks(nostdlib = noStdLib, noDefaultLibs = noDefaultLibs).map { 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 // Make sure the user provided ones appear first, so that
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int, 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 { : KonanLibraryReader {
// For the zipped libraries inPlace gives files from zip file system // 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 }