From e906d298d0a5bbfc5b827d4fa49cf37c8a477b7b Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Thu, 18 Jun 2020 19:30:27 +0500 Subject: [PATCH] Ignored caches for optimized compilation --- .../org/jetbrains/kotlin/backend/konan/CacheSupport.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CacheSupport.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CacheSupport.kt index a7bd605846c..b9f786c9197 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CacheSupport.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CacheSupport.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.backend.konan +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.target.CompilerOutputKind @@ -49,11 +50,15 @@ class CacheSupport( library to cachePath } + val optimized = configuration.getBoolean(KonanConfigKeys.OPTIMIZATION) + if (optimized && (explicitCacheFiles.isNotEmpty() || implicitCacheDirectories.isNotEmpty())) + configuration.report(CompilerMessageSeverity.WARNING, "Cached libraries will not be used for optimized compilation") + CachedLibraries( target = target, allLibraries = allLibraries, - explicitCaches = explicitCaches, - implicitCacheDirectories = implicitCacheDirectories + explicitCaches = if (optimized) emptyMap() else explicitCaches, + implicitCacheDirectories = if (optimized) emptyList() else implicitCacheDirectories ) }