Rework compiler dependency management

And support for searching them locally and
downloading from internal server if KONAN_USE_INTERNAL_SERVER is set

Also:
Allow sysroot to change version minorly.
This commit is contained in:
Svyatoslav Scherbina
2017-12-08 14:14:50 +03:00
committed by SvyatoslavScherbina
parent 257f156e97
commit 228ec9d286
14 changed files with 173 additions and 33 deletions
@@ -52,15 +52,8 @@ class Distribution(val targetManager: TargetManager,
val dependenciesDir = DependencyProcessor.defaultDependenciesRoot.absolutePath
val targetProperties = KonanProperties(target, properties, dependenciesDir)
val hostProperties = if (target == host) {
targetProperties
} else {
KonanProperties(host, properties, dependenciesDir)
}
val dependencies = targetProperties.dependencies
val llvmHome = hostProperties.absoluteLlvmHome
val hostSysRoot = hostProperties.absoluteTargetSysRoot
val llvmHome = targetProperties.absoluteLlvmHome
val llvmBin = "$llvmHome/bin"
val llvmLib = "$llvmHome/lib"
val llvmLto = "$llvmBin/llvm-lto"
@@ -54,7 +54,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
private fun Distribution.prepareDependencies(checkDependencies: Boolean) {
if (checkDependencies) {
DependencyProcessor(java.io.File(dependenciesDir), targetProperties).run()
targetProperties.downloadDependencies()
}
}
+3
View File
@@ -17,6 +17,9 @@
# TODO: Do we need a $variable substitution mechanism here?
dependenciesUrl = https://download.jetbrains.com/kotlin/native
# In order of preference:
dependencyProfiles = default alt
# Don't check dependencies on a server.
# If true, dependency downloader will throw an exception if a dependency isn't found in konan.home.
airplaneMode = false