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

[K/N] Remove global execClang extension

Browse Source
This commit is contained in:
Alexander Shabalin
2024-03-04 23:16:55 +01:00
committed by Space Team
parent aead2c2bff
commit 3532056e0d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+3 -1
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.konan.exec.Command
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.LinkerOutputKind import org.jetbrains.kotlin.konan.target.LinkerOutputKind
import org.jetbrains.kotlin.konan.target.PlatformManager
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.File import java.io.File
import java.util.regex.Pattern import java.util.regex.Pattern
@@ -481,7 +482,8 @@ open class KonanDynamicTest : KonanStandaloneTest() {
private fun clang() { private fun clang() {
val log = ByteArrayOutputStream() val log = ByteArrayOutputStream()
val plugin = project.extensions.getByType<ExecClang>() val platformManager = project.extensions.getByType<PlatformManager>()
val plugin = ExecClang.create(project.objects, platformManager)
val artifactsDir = "$outputDirectory/${project.testTarget}" val artifactsDir = "$outputDirectory/${project.testTarget}"
fun flagsContain(opt: String) = project.globalTestArgs.contains(opt) || flags.contains(opt) fun flagsContain(opt: String) = project.globalTestArgs.contains(opt) || flags.contains(opt)
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
+3 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cpp.*
import org.jetbrains.kotlin.dependencies.NativeDependenciesExtension import org.jetbrains.kotlin.dependencies.NativeDependenciesExtension
import org.jetbrains.kotlin.dependencies.NativeDependenciesPlugin import org.jetbrains.kotlin.dependencies.NativeDependenciesPlugin
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.konan.target.SanitizerKind import org.jetbrains.kotlin.konan.target.SanitizerKind
import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer
import org.jetbrains.kotlin.konan.target.TargetWithSanitizer import org.jetbrains.kotlin.konan.target.TargetWithSanitizer
@@ -205,7 +206,8 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) :
} }
private val compilationDatabase = project.extensions.getByType<CompilationDatabaseExtension>() private val compilationDatabase = project.extensions.getByType<CompilationDatabaseExtension>()
private val execClang = project.extensions.getByType<ExecClang>() private val platformManager = project.extensions.getByType<PlatformManager>()
private val execClang = ExecClang.create(project.objects, platformManager)
private val nativeDependencies = project.extensions.getByType<NativeDependenciesExtension>() private val nativeDependencies = project.extensions.getByType<NativeDependenciesExtension>()
/** /**
kotlin-native/build.gradle
-1
View File
@@ -88,7 +88,6 @@ void setupHostAndTarget() {
void setupClang(Project project) { void setupClang(Project project) {
project.extensions.platformManager = project.project(":kotlin-native").ext.platformManager project.extensions.platformManager = project.project(":kotlin-native").ext.platformManager
project.extensions.execClang = org.jetbrains.kotlin.ExecClang.create(project)
} }
configurations { configurations {