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

Some renaming to reflect reality.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-12-04 12:39:28 +03:00
committed by alexander-gorshenev
parent 86e221ed58
commit 5116d43f4f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/NoJavaUtil.kt → shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/File.kt
View File
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.konan.target
import org.jetbrains.kotlin.konan.properties.KonanProperties import org.jetbrains.kotlin.konan.properties.KonanProperties
import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.file.File
class ClangTarget(val target: KonanTarget, konanProperties: KonanProperties) { class ClangTargetArgs(val target: KonanTarget, konanProperties: KonanProperties) {
val sysRoot = konanProperties.absoluteTargetSysRoot val sysRoot = konanProperties.absoluteTargetSysRoot
val targetArg = konanProperties.targetArg val targetArg = konanProperties.targetArg
@@ -96,7 +96,7 @@ class ClangTarget(val target: KonanTarget, konanProperties: KonanProperties) {
} }
} }
class ClangHost(val hostProperties: KonanProperties) { class ClangHostArgs(val hostProperties: KonanProperties) {
val targetToolchain get() = hostProperties.absoluteTargetToolchain val targetToolchain get() = hostProperties.absoluteTargetToolchain
val gccToolchain get() = hostProperties.absoluteGccToolchain val gccToolchain get() = hostProperties.absoluteGccToolchain
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangCross.kt → shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangManager.kt
+5 -5
View File
@@ -25,18 +25,18 @@ class ClangManager(val properties: Properties, val baseDir: String) {
it to KonanProperties(it, properties, baseDir) it to KonanProperties(it, properties, baseDir)
}.toMap() }.toMap()
private val targetClangs = enabledTargets.map { private val targetClangArgs = enabledTargets.map {
it to ClangTarget(it, konanProperties[it]!!) it to ClangTargetArgs(it, konanProperties[it]!!)
}.toMap() }.toMap()
private val hostClang = ClangHost(konanProperties[host]!!) private val hostClang = ClangHostArgs(konanProperties[host]!!)
// These are converted to arrays to be convenient // These are converted to arrays to be convenient
// in groovy plugins. // in groovy plugins.
val hostClangArgs = (hostClang.commonClangArgs + targetClangs[host]!!.specificClangArgs).toTypedArray() val hostClangArgs = (hostClang.commonClangArgs + targetClangArgs[host]!!.specificClangArgs).toTypedArray()
fun targetClangArgs(target: KonanTarget) fun targetClangArgs(target: KonanTarget)
= (hostClang.commonClangArgs + targetClangs[target]!!.specificClangArgs).toTypedArray() = (hostClang.commonClangArgs + targetClangArgs[target]!!.specificClangArgs).toTypedArray()
val hostCompilerArgsForJni = hostClang.hostCompilerArgsForJni.toTypedArray() val hostCompilerArgsForJni = hostClang.hostCompilerArgsForJni.toTypedArray()
} }