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

[Gradle] Improve UP-TO-DATE checks for K/N binary options

Browse Source
This commit is contained in:
Ilya Matveev
2021-08-26 17:08:03 +07:00
committed by Space
parent 6ad9af972e
commit cbe5dc40ef
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+2 -5
View File
@@ -591,10 +591,7 @@ constructor(
@Input get() = binary.linkerOpts @Input get() = binary.linkerOpts
val binaryOptions: Map<String, String> val binaryOptions: Map<String, String>
@Input get() = binary.binaryOptions @Input get() = PropertiesProvider(project).nativeBinaryOptions + binary.binaryOptions
val projectWideBinaryOptions: Map<String, String>
@Input get() = PropertiesProvider(project).nativeBinaryOptions
val processTests: Boolean val processTests: Boolean
@Input get() = binary is TestExecutable @Input get() = binary is TestExecutable
@@ -639,7 +636,7 @@ constructor(
linkerOpts.forEach { linkerOpts.forEach {
addArg("-linker-option", it) addArg("-linker-option", it)
} }
(projectWideBinaryOptions + binaryOptions).forEach { (name, value) -> binaryOptions.forEach { (name, value) ->
add("-Xbinary=$name=$value") add("-Xbinary=$name=$value")
} }
exportLibraries.files.filterKlibsPassedToCompiler().forEach { exportLibraries.files.filterKlibsPassedToCompiler().forEach {