[K/N] Rename llvmCoverageMappingC to libllvmext
This subproject covers much wider scope now than code coverage, so it makes sense to rename it to reflex that.
This commit is contained in:
@@ -57,7 +57,7 @@ backend.native/tests/teamcity-test.property
|
|||||||
samples/**/*.kt.bc-build
|
samples/**/*.kt.bc-build
|
||||||
|
|
||||||
# CMake
|
# CMake
|
||||||
llvmCoverageMappingC/CMakeLists.txt
|
libllvmext/CMakeLists.txt
|
||||||
tools/performance-server/node_modules
|
tools/performance-server/node_modules
|
||||||
tools/performance-server/server
|
tools/performance-server/server
|
||||||
tools/performance-server/ui/js
|
tools/performance-server/ui/js
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ kotlinNativeInterop {
|
|||||||
llvm {
|
llvm {
|
||||||
|
|
||||||
dependsOn ":kotlin-native:llvmDebugInfoC:${NativePluginKt.lib("debugInfo")}"
|
dependsOn ":kotlin-native:llvmDebugInfoC:${NativePluginKt.lib("debugInfo")}"
|
||||||
dependsOn ":kotlin-native:llvmCoverageMappingC:${NativePluginKt.lib("coverageMapping")}"
|
dependsOn ":kotlin-native:libllvmext:${NativePluginKt.lib("llvmext")}"
|
||||||
defFile 'llvm.def'
|
defFile 'llvm.def'
|
||||||
compilerOpts "-I$llvmDir/include", "-I${rootProject.project(':kotlin-native:llvmDebugInfoC').projectDir}/src/main/include", "-I${rootProject.project(':kotlin-native:llvmCoverageMappingC').projectDir}/src/main/include"
|
compilerOpts "-I$llvmDir/include", "-I${rootProject.project(':kotlin-native:llvmDebugInfoC').projectDir}/src/main/include", "-I${rootProject.project(':kotlin-native:libllvmext').projectDir}/src/main/include"
|
||||||
if (isMac()) {
|
if (isMac()) {
|
||||||
// $llvmDir/lib contains libc++.1.dylib too, and it seems to be preferred by the linker
|
// $llvmDir/lib contains libc++.1.dylib too, and it seems to be preferred by the linker
|
||||||
// over the sysroot-provided one.
|
// over the sysroot-provided one.
|
||||||
@@ -61,7 +61,7 @@ kotlinNativeInterop {
|
|||||||
// To enforce linking with proper libc++, pass the default path explicitly:
|
// To enforce linking with proper libc++, pass the default path explicitly:
|
||||||
linkerOpts "-L${platformManager.hostPlatform.absoluteTargetSysRoot}/usr/lib"
|
linkerOpts "-L${platformManager.hostPlatform.absoluteTargetSysRoot}/usr/lib"
|
||||||
}
|
}
|
||||||
linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:llvmCoverageMappingC').buildDir}"
|
linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:libllvmext').buildDir}"
|
||||||
}
|
}
|
||||||
|
|
||||||
files {
|
files {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ linkerOpts = -fvisibility-inlines-hidden \
|
|||||||
-pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \
|
-pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \
|
||||||
-std=c++17 \
|
-std=c++17 \
|
||||||
-DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \
|
-DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \
|
||||||
-ldebugInfo -lcoverageMapping
|
-ldebugInfo -lllvmext
|
||||||
|
|
||||||
# ./llvm-config --libs analysis bitreader bitwriter core linker target coverage analysis ipo instrumentation lto objcarcopts arm aarch64 webassembly x86 mips
|
# ./llvm-config --libs analysis bitreader bitwriter core linker target coverage analysis ipo instrumentation lto objcarcopts arm aarch64 webassembly x86 mips
|
||||||
linkerOpts.osx = \
|
linkerOpts.osx = \
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ task distCompiler(type: Copy) {
|
|||||||
into('konan/nativelib')
|
into('konan/nativelib')
|
||||||
}
|
}
|
||||||
|
|
||||||
from(project(':kotlin-native:llvmCoverageMappingC').file('build/libs/coverageMapping/shared')) {
|
from(project(':kotlin-native:libllvmext').file('build/libs/llvmext/shared')) {
|
||||||
into('konan/nativelib')
|
into('konan/nativelib')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ native {
|
|||||||
}
|
}
|
||||||
val objSet = sourceSets["main"]!!.transform(".cpp" to ".$obj")
|
val objSet = sourceSets["main"]!!.transform(".cpp" to ".$obj")
|
||||||
|
|
||||||
target(lib("coverageMapping"), objSet) {
|
target(lib("llvmext"), objSet) {
|
||||||
tool(*platformManager.hostPlatform.clangForJni.llvmAr("").toTypedArray())
|
tool(*platformManager.hostPlatform.clangForJni.llvmAr("").toTypedArray())
|
||||||
flags("-qv", ruleOut(), *ruleInAll())
|
flags("-qv", ruleOut(), *ruleInAll())
|
||||||
}
|
}
|
||||||
+1
-1
@@ -768,7 +768,7 @@ if (buildProperties.isKotlinNativeEnabled) {
|
|||||||
include ':kotlin-native:klib'
|
include ':kotlin-native:klib'
|
||||||
include ':kotlin-native:common'
|
include ':kotlin-native:common'
|
||||||
include ':kotlin-native:runtime'
|
include ':kotlin-native:runtime'
|
||||||
include ':kotlin-native:llvmCoverageMappingC'
|
include ':kotlin-native:libllvmext'
|
||||||
include ':kotlin-native:llvmDebugInfoC'
|
include ':kotlin-native:llvmDebugInfoC'
|
||||||
include ':kotlin-native:utilities'
|
include ':kotlin-native:utilities'
|
||||||
include ':kotlin-native:platformLibs'
|
include ':kotlin-native:platformLibs'
|
||||||
|
|||||||
Reference in New Issue
Block a user