Unify compiler and cinterop flags names (#2294)
This commit is contained in:
+1
-1
@@ -160,7 +160,7 @@ extra["versions.trove4j"] = "1.0.20181211"
|
||||
extra["versions.kotlin-native-shared"] = "1.0-dev-40"
|
||||
|
||||
if (!project.hasProperty("versions.kotlin-native")) {
|
||||
extra["versions.kotlin-native"] = "1.3-dev-9457"
|
||||
extra["versions.kotlin-native"] = "1.3-dev-9780"
|
||||
}
|
||||
|
||||
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
||||
|
||||
+3
-3
@@ -523,18 +523,18 @@ open class CInteropProcess : DefaultTask() {
|
||||
addFileArgs("-header", headers)
|
||||
|
||||
compilerOpts.forEach {
|
||||
addArg("-compilerOpt", it)
|
||||
addArg("-compiler-option", it)
|
||||
}
|
||||
|
||||
linkerOpts.forEach {
|
||||
addArg("-linkerOpt", it)
|
||||
addArg("-linker-option", it)
|
||||
}
|
||||
|
||||
libraries.files.filterExternalKlibs(project).forEach { library ->
|
||||
addArg("-library", library.absolutePath)
|
||||
}
|
||||
|
||||
addArgs("-compilerOpt", allHeadersDirs.map { "-I${it.absolutePath}" })
|
||||
addArgs("-compiler-option", allHeadersDirs.map { "-I${it.absolutePath}" })
|
||||
addArgs("-headerFilterAdditionalSearchPrefix", headerFilterDirs.map { it.absolutePath })
|
||||
|
||||
addAll(extraOpts)
|
||||
|
||||
Reference in New Issue
Block a user