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

Cleanup ClangArgs.kt a little bit

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-03-23 18:55:15 +07:00
committed by TeamCityServer
parent 273b43d227
commit 3a008f6236
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+2 -17
View File
@@ -95,27 +95,10 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
}.flatten() }.flatten()
private val specificClangArgs: List<String> = when (target) { private val specificClangArgs: List<String> = when (target) {
KonanTarget.LINUX_X64,
KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32,
KonanTarget.LINUX_ARM64,
KonanTarget.MINGW_X64, KonanTarget.MINGW_X86 -> emptyList()
KonanTarget.LINUX_ARM32_HFP -> listOf( KonanTarget.LINUX_ARM32_HFP -> listOf(
"-mfpu=vfp", "-mfloat-abi=hard" "-mfpu=vfp", "-mfloat-abi=hard"
) )
KonanTarget.MACOS_X64,
KonanTarget.MACOS_ARM64,
KonanTarget.IOS_ARM32,
KonanTarget.IOS_ARM64,
KonanTarget.IOS_X64,
KonanTarget.TVOS_ARM64,
KonanTarget.TVOS_X64,
KonanTarget.WATCHOS_ARM64,
KonanTarget.WATCHOS_ARM32,
KonanTarget.WATCHOS_X86,
KonanTarget.WATCHOS_X64 -> listOf()
KonanTarget.ANDROID_ARM32, KonanTarget.ANDROID_ARM64, KonanTarget.ANDROID_ARM32, KonanTarget.ANDROID_ARM64,
KonanTarget.ANDROID_X86, KonanTarget.ANDROID_X64 -> { KonanTarget.ANDROID_X86, KonanTarget.ANDROID_X64 -> {
val clangTarget = targetArg!! val clangTarget = targetArg!!
@@ -161,6 +144,8 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
"-isystem$absoluteTargetSysRoot/include/libcxx", "-isystem$absoluteTargetSysRoot/include/libcxx",
"-isystem$absoluteTargetSysRoot/include/libc" "-isystem$absoluteTargetSysRoot/include/libc"
) + (configurables as ZephyrConfigurables).constructClangArgs() ) + (configurables as ZephyrConfigurables).constructClangArgs()
else -> emptyList()
} }
val clangPaths = listOf("$absoluteLlvmHome/bin", binDir) val clangPaths = listOf("$absoluteLlvmHome/bin", binDir)