Add .def file depends to dependencies of platform klibs
Also disable inconsistent dependencies.
This commit is contained in:
committed by
SvyatoslavScherbina
parent
99c3c392c7
commit
509604618c
+2
-1
@@ -285,7 +285,8 @@ targetList.each { target ->
|
||||
'defFile' : defFile.file.absolutePath,
|
||||
'konan.home' : project.file('dist'),
|
||||
'target' : target,
|
||||
'suffix' : suffix
|
||||
'suffix' : suffix,
|
||||
'libraries' : defFile.config.depends.join(" ")
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ buildscript {
|
||||
}
|
||||
|
||||
def taskName = "${gradle.startParameter.projectProperties['name']}"
|
||||
String konanHome = gradle.startParameter.projectProperties['konan.home']
|
||||
List<String> libraries = gradle.startParameter.projectProperties.libraries.split(" ").findAll { !it.isEmpty() }
|
||||
|
||||
konanInterop {
|
||||
"$taskName" {
|
||||
@@ -16,11 +18,12 @@ konanInterop {
|
||||
pkg gradle.startParameter.projectProperties.name
|
||||
target gradle.startParameter.projectProperties.target
|
||||
noDefaultLibs true
|
||||
extraOpts libraries.collectMany { ["-library", "$konanHome/klib/$it"] }
|
||||
}
|
||||
}
|
||||
|
||||
def suffix = gradle.startParameter.projectProperties['suffix']
|
||||
def klibProgram = suffix?"${gradle.startParameter.projectProperties['konan.home']}/bin/klib.$suffix" : "${gradle.startParameter.projectProperties['konan.home']}/bin/klib"
|
||||
def klibProgram = suffix?"$konanHome/bin/klib.$suffix" : "$konanHome/bin/klib"
|
||||
|
||||
task klibInstall(type:Exec) {
|
||||
dependsOn konanInterop["$taskName"].interopProcessingTask
|
||||
@@ -28,5 +31,5 @@ task klibInstall(type:Exec) {
|
||||
'install',
|
||||
konanInterop["$taskName"].interopProcessingTask.klib,
|
||||
'-repository',
|
||||
"${gradle.startParameter.projectProperties['konan.home']}/klib"
|
||||
"$konanHome/klib"
|
||||
}
|
||||
|
||||
@@ -34,4 +34,4 @@ headers = aio.h aliases.h a.out.h argp.h argz.h byteswap.h cpio.h crypt.h \
|
||||
sys/vt.h sys/vtimes.h sys/xattr.h
|
||||
|
||||
compilerOpts = -D_GNU_SOURCE
|
||||
depends = posix
|
||||
#depends = posix
|
||||
Reference in New Issue
Block a user