A configurable zephyr board support.

This commit is contained in:
Alexander Gorshenev
2018-01-16 17:43:55 +03:00
committed by alexander-gorshenev
parent d968fafec0
commit 9789420ed3
63 changed files with 665 additions and 473 deletions
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.backend.konan.library.impl.KonanLibrary
import org.jetbrains.kotlin.backend.konan.library.resolveLibrariesRecursive
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.properties.loadProperties
import org.jetbrains.kotlin.konan.target.TargetManager
import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.native.interop.gen.jvm.interop
import org.jetbrains.kotlin.utils.addIfNotNull
@@ -35,7 +35,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
val cinteropArgFilter = listOf(NODEFAULTLIBS, PURGE_USER_LIBS)
var outputFileName = "nativelib"
var target = "host"
var targetRequest = "host"
val libraries = mutableListOf<String>()
val repos = mutableListOf<String>()
var noDefaultLibs = false
@@ -46,7 +46,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
if (arg.startsWith("-o"))
outputFileName = nextArg ?: outputFileName
if (arg == "-target")
target = nextArg ?: target
targetRequest = nextArg ?: targetRequest
if (arg == "-library")
libraries.addIfNotNull(nextArg)
if (arg == "-r" || arg == "-repo")
@@ -64,10 +64,10 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
val cstubsName ="cstubs"
val manifest = File(buildDir, "manifest.properties")
val targetManager = TargetManager(target)
val resolver = defaultResolver(repos, targetManager.target)
val target = PlatformManager().targetManager(targetRequest).target
val resolver = defaultResolver(repos, target)
val allLibraries = resolver.resolveLibrariesRecursive(
libraries, targetManager.target, noStdLib = true, noDefaultLibs = noDefaultLibs
libraries, target, noStdLib = true, noDefaultLibs = noDefaultLibs
)
val importArgs = allLibraries.flatMap {
@@ -104,7 +104,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String> {
generatedDir.path,
"-produce", "library",
"-o", outputFileName,
"-target", target,
"-target", target.visibleName,
"-manifest", manifest.path) +
nativeStubs +
cinteropArgsToCompiler +