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

[K/N] Drop Configurables interface for ClangArgs

Browse Source 
ClangArgs abused delegation mechanism and it complicated its interface.
This commit is contained in:
Sergey Bogolepov
2021-07-23 11:02:04 +07:00
committed by Space
parent a783ee9ae7
commit fbbbc1c092
1 changed files with 11 additions and 5 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
+11 -5
View File
@@ -31,10 +31,16 @@ internal object Android {
"android-${API}/arch-${architectureMap.getValue(target)}" "android-${API}/arch-${architectureMap.getValue(target)}"
} }
class ClangArgs(private val configurables: Configurables) : Configurables by configurables { class ClangArgs(private val configurables: Configurables) {
private val absoluteTargetToolchain = configurables.absoluteTargetToolchain
private val absoluteTargetSysRoot = configurables.absoluteTargetSysRoot
private val absoluteLlvmHome = configurables.absoluteLlvmHome
private val target = configurables.target
private val targetTriple = configurables.targetTriple
private val clangArgsSpecificForKonanSources private val clangArgsSpecificForKonanSources
get() = runtimeDefinitions.map { "-D$it" } get() = configurables.runtimeDefinitions.map { "-D$it" }
private val binDir = when (HostManager.host) { private val binDir = when (HostManager.host) {
KonanTarget.LINUX_X64 -> "$absoluteTargetToolchain/bin" KonanTarget.LINUX_X64 -> "$absoluteTargetToolchain/bin"
@@ -135,8 +141,8 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
"-nostdinc", "-nostdinc",
// TODO: make it a libGcc property? // TODO: make it a libGcc property?
// We need to get rid of wasm sysroot first. // We need to get rid of wasm sysroot first.
"-isystem $targetToolchain/../lib/gcc/arm-none-eabi/7.2.1/include", "-isystem ${configurables.targetToolchain}/../lib/gcc/arm-none-eabi/7.2.1/include",
"-isystem $targetToolchain/../lib/gcc/arm-none-eabi/7.2.1/include-fixed", "-isystem ${configurables.targetToolchain}/../lib/gcc/arm-none-eabi/7.2.1/include-fixed",
"-isystem$absoluteTargetSysRoot/include/libcxx", "-isystem$absoluteTargetSysRoot/include/libcxx",
"-isystem$absoluteTargetSysRoot/include/libc" "-isystem$absoluteTargetSysRoot/include/libc"
) + (configurables as ZephyrConfigurables).constructClangArgs() ) + (configurables as ZephyrConfigurables).constructClangArgs()
@@ -185,7 +191,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
// See e.g. http://lists.llvm.org/pipermail/cfe-dev/2013-November/033680.html // See e.g. http://lists.llvm.org/pipermail/cfe-dev/2013-November/033680.html
// We workaround the problem with -isystem flag below. // We workaround the problem with -isystem flag below.
// TODO: Revise after update to LLVM 10. // TODO: Revise after update to LLVM 10.
listOf("-isystem", "$absoluteLlvmHome/lib/clang/$llvmVersion/include") listOf("-isystem", "$absoluteLlvmHome/lib/clang/${configurables.llvmVersion}/include")
/** /**
* libclang args for plain C and Objective-C. * libclang args for plain C and Objective-C.