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

Native: support compileBitcodeWithXcodeLlvm=false binary option

Browse Source 
This option makes the compiler use Kotlin/Native-provided LLVM
instead of Xcode-provided LLVM when compiling bitcode to machine code
for Apple targets.

^KT-54799 Fixed
This commit is contained in:
Svyatoslav Scherbina
2023-03-30 18:05:00 +00:00
committed by Space Team
parent 1aa3e54459
commit f5532abd11
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BinaryOptions.kt
+2
View File
@@ -50,6 +50,8 @@ object BinaryOptions : BinaryOptionRegistry() {
val mimallocUseDefaultOptions by booleanOption() val mimallocUseDefaultOptions by booleanOption()
val mimallocUseCompaction by booleanOption() val mimallocUseCompaction by booleanOption()
val compileBitcodeWithXcodeLlvm by booleanOption()
} }
open class BinaryOption<T : Any>( open class BinaryOption<T : Any>(
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BitcodeCompiler.kt
+1 -1
View File
@@ -71,7 +71,7 @@ internal class BitcodeCompiler(
} }
val bitcodePath = bitcodeFile.absoluteFile.normalize().path val bitcodePath = bitcodeFile.absoluteFile.normalize().path
val objectPath = objectFile.absoluteFile.normalize().path val objectPath = objectFile.absoluteFile.normalize().path
if (configurables is AppleConfigurables) { if (configurables is AppleConfigurables && config.configuration.get(BinaryOptions.compileBitcodeWithXcodeLlvm) != false) {
targetTool("clang++", *flags.toTypedArray(), bitcodePath, "-o", objectPath) targetTool("clang++", *flags.toTypedArray(), bitcodePath, "-o", objectPath)
} else { } else {
hostLlvmTool("clang++", *flags.toTypedArray(), bitcodePath, "-o", objectPath) hostLlvmTool("clang++", *flags.toTypedArray(), bitcodePath, "-o", objectPath)