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

Unify compiler and cinterop flags names (#2294)

Browse Source
This commit is contained in:
LepilkinaElena
2019-04-26 13:34:14 +03:00
committed by GitHub
parent 7b017cb76f
commit 02331fbd7e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -160,7 +160,7 @@ extra["versions.trove4j"] = "1.0.20181211"
extra["versions.kotlin-native-shared"] = "1.0-dev-40" extra["versions.kotlin-native-shared"] = "1.0-dev-40"
if (!project.hasProperty("versions.kotlin-native")) { 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 val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+3 -3
View File
@@ -523,18 +523,18 @@ open class CInteropProcess : DefaultTask() {
addFileArgs("-header", headers) addFileArgs("-header", headers)
compilerOpts.forEach { compilerOpts.forEach {
addArg("-compilerOpt", it) addArg("-compiler-option", it)
} }
linkerOpts.forEach { linkerOpts.forEach {
addArg("-linkerOpt", it) addArg("-linker-option", it)
} }
libraries.files.filterExternalKlibs(project).forEach { library -> libraries.files.filterExternalKlibs(project).forEach { library ->
addArg("-library", library.absolutePath) 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 }) addArgs("-headerFilterAdditionalSearchPrefix", headerFilterDirs.map { it.absolutePath })
addAll(extraOpts) addAll(extraOpts)