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

[K/N] Fix KT-48552

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-09-02 11:51:57 +07:00
committed by Space
parent 11314a5c4e
commit 9620279201
1 changed files with 14 additions and 0 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
+14
View File
@@ -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)