From 8dc460ae4aaff133d9ed436e23875f879554e4ee Mon Sep 17 00:00:00 2001 From: cristiangarcia Date: Tue, 12 Mar 2024 15:26:51 +0100 Subject: [PATCH] Fix CompileToExecutable CC issues Required for KTI-1553 --- .../main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt | 1 - .../jetbrains/kotlin/gradle/plugin/konan/KonanBuildingConfig.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt index 9dd79a50276..fa4720035d3 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt @@ -213,7 +213,6 @@ abstract class CompileToExecutable : DefaultTask() { @get:Input abstract val linkerArgs: ListProperty - @Internal fun linkCommands(): List> = // Getting link commands requires presence of a target toolchain. // Thus we cannot get them at the configuration stage because the toolchain may be not downloaded yet. diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanBuildingConfig.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanBuildingConfig.kt index 487e49ab008..b36ef44719d 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanBuildingConfig.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanBuildingConfig.kt @@ -110,6 +110,7 @@ abstract class KonanBuildingConfig( init(this@KonanBuildingConfig, outputDescription.destinationDir, outputDescription.artifactName, target) group = BasePlugin.BUILD_GROUP description = generateTaskDescription(this) + notCompatibleWithConfigurationCache("") } private fun createAggregateTask(): TaskProvider =