azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No colon cinterop flags (#428)

Browse Source 
* Taught cinterop a 'host' target.

* Last minute switch from -foo:bar flags to -foo bar flags in cinterop tool.
This commit is contained in:
alexander-gorshenev
2017-03-31 10:20:29 +03:00
committed by Nikolay Igotti
parent b2a57e7cb3
commit c9c9aee7bb
11 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy
+14 -14
View File
@@ -206,42 +206,42 @@ class NamedNativeInteropConfig implements Named {
linkerOpts += linkFiles.files
args "-properties:" + project.findProject(":backend.native").file("konan.properties")
args "-generated:" + generatedSrcDir
args "-natives:" + nativeLibsDir
args "-flavor:" + this.flavor
args '-properties', project.findProject(":backend.native").file("konan.properties")
args '-generated', generatedSrcDir
args '-natives', nativeLibsDir
args '-flavor', this.flavor
// Uncomment to debug.
// args "-verbose:true"
// args '-verbose', 'true'
if (defFile != null) {
args "-def:" + project.file(defFile)
args '-def', project.file(defFile)
}
if (pkg != null) {
args "-pkg:" + pkg
args '-pkg', pkg
}
if (linker != null) {
args "-linker:" + linker
args '-linker', linker
}
if (target != null) {
args "-target:" + target
args '-target', target
}
// TODO: the interop plugin should probably be reworked to execute clang from build scripts directly
environment['PATH'] = project.files(project.clangPath).asPath +
File.pathSeparator + environment['PATH']
args compilerOpts.collect { "-copt:$it" }
args linkerOpts.collect { "-lopt:$it" }
args compilerOpts.collectMany { ['-copt', it] }
args linkerOpts.collectMany { ['-lopt', it] }
headers.each {
args "-h:$it"
args '-h', it
}
if (project.hasProperty("shims")) {
args "-shims:$project.ext.shims"
if (project.hasProperty('shims')) {
args '-shims', project.ext.shims
}
}