[build] joint (step 2)
- dist: - compiler - tools(cinterop,klib) - stdlib - cache
This commit is contained in:
+1
-1
@@ -207,7 +207,7 @@ class NamedNativeInteropConfig implements Named {
|
||||
).asPath
|
||||
// Set the konan.home property because we run the cinterop tool not from a distribution jar
|
||||
// so it will not be able to determine this path by itself.
|
||||
systemProperties "konan.home": project.rootProject.projectDir
|
||||
systemProperties "konan.home": project.project(":kotlin-native").projectDir
|
||||
environment "LIBCLANG_DISABLE_CRASH_RECOVERY": "1"
|
||||
|
||||
outputs.dir generatedSrcDir
|
||||
|
||||
@@ -466,7 +466,7 @@ open class KonanDynamicTest : KonanStandaloneTest() {
|
||||
|
||||
val execResult = plugin.execKonanClang(project.testTarget, Action<ExecSpec> {
|
||||
workingDir = File(outputDirectory)
|
||||
executable = clangTool
|
||||
this@Action.executable = clangTool
|
||||
args = listOf(processCSource(),
|
||||
"-c",
|
||||
"-o", "${this@KonanDynamicTest.executable}.o",
|
||||
|
||||
@@ -32,7 +32,7 @@ object PlatformInfo {
|
||||
|
||||
@JvmStatic
|
||||
fun getTarget(project: Project): KonanTarget {
|
||||
val platformManager = project.rootProject.platformManager
|
||||
val platformManager = project.project(":kotlin-native").platformManager
|
||||
val targetName = project.project.testTarget.name
|
||||
return platformManager.targetManager(targetName).target
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user