From 3a008f6236cee138b4070d9f3e753ec5e39e3d6e Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Tue, 23 Mar 2021 18:55:15 +0700 Subject: [PATCH] Cleanup ClangArgs.kt a little bit --- .../kotlin/konan/target/ClangArgs.kt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt index 09fb8a299e9..cec74bb325f 100644 --- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt +++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt @@ -95,27 +95,10 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con }.flatten() private val specificClangArgs: List = 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( "-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_X86, KonanTarget.ANDROID_X64 -> { val clangTarget = targetArg!! @@ -161,6 +144,8 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con "-isystem$absoluteTargetSysRoot/include/libcxx", "-isystem$absoluteTargetSysRoot/include/libc" ) + (configurables as ZephyrConfigurables).constructClangArgs() + + else -> emptyList() } val clangPaths = listOf("$absoluteLlvmHome/bin", binDir)