diff --git a/build.gradle b/build.gradle index 21b138e6fef..dccce9e482c 100644 --- a/build.gradle +++ b/build.gradle @@ -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(" ") ] } } diff --git a/klib/platform.gradle b/klib/platform.gradle index 2d9a24af21c..8ab1d736c6a 100644 --- a/klib/platform.gradle +++ b/klib/platform.gradle @@ -9,6 +9,8 @@ buildscript { } def taskName = "${gradle.startParameter.projectProperties['name']}" +String konanHome = gradle.startParameter.projectProperties['konan.home'] +List 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" } diff --git a/klib/src/platform/linux/linux.def b/klib/src/platform/linux/linux.def index 8830a3f8211..3a27036cbf0 100644 --- a/klib/src/platform/linux/linux.def +++ b/klib/src/platform/linux/linux.def @@ -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 \ No newline at end of file +#depends = posix \ No newline at end of file