From 962027920152f29eb083f08a01b9f2e9f6711505 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 2 Sep 2021 11:51:57 +0700 Subject: [PATCH] [K/N] Fix KT-48552 --- .../targets/native/tasks/KotlinNativeTasks.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index a1d68a0d512..54406b8000d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -986,6 +986,13 @@ internal class CacheBuilder( ) if (debuggable) args += "-g" + // It's a dirty workaround, but we need a Gradle Build Service for a proper solution, + // which is too big to put in 1.6.0, so let's use ad-hoc solution for now. + // TODO: https://youtrack.jetbrains.com/issue/KT-48553. + if (konanTarget == KonanTarget.IOS_ARM64) { + // See https://youtrack.jetbrains.com/issue/KT-48552 + args += "-Xembed-bitcode-marker" + } args += externalDependenciesArgs args += "-Xadd-cache=${library.libraryFile.absolutePath}" args += "-Xcache-directory=${cacheDirectory.absolutePath}" @@ -1040,6 +1047,13 @@ internal class CacheBuilder( ) if (debuggable) args += "-g" + // It's a dirty workaround, but we need a Gradle Build Service for a proper solution, + // which is too big to put in 1.6.0, so let's use ad-hoc solution for now. + // TODO: https://youtrack.jetbrains.com/issue/KT-48553. + if (konanTarget == KonanTarget.IOS_ARM64) { + // See https://youtrack.jetbrains.com/issue/KT-48552 + args += "-Xembed-bitcode-marker" + } args += "-Xadd-cache=${platformLib.absolutePath}" args += "-Xcache-directory=${rootCacheDirectory.absolutePath}" KotlinNativeCompilerRunner(project).run(args)