Fix benchmarks after migrating to new MPP plugin syntax
This commit is contained in:
@@ -174,7 +174,7 @@ fun getJvmCompileTime(programName: String): BenchmarkResult =
|
|||||||
|
|
||||||
@JvmOverloads
|
@JvmOverloads
|
||||||
fun getNativeCompileTime(programName: String,
|
fun getNativeCompileTime(programName: String,
|
||||||
tasks: List<String> = listOf("compileKotlinNative", "linkMainReleaseExecutableNative")): BenchmarkResult =
|
tasks: List<String> = listOf("compileKotlinNative", "linkBenchmarkReleaseExecutableNative")): BenchmarkResult =
|
||||||
TaskTimerListener.getBenchmarkResult(programName, tasks)
|
TaskTimerListener.getBenchmarkResult(programName, tasks)
|
||||||
|
|
||||||
fun getCompileBenchmarkTime(programName: String, tasksNames: Iterable<String>, repeats: Int, exitCodes: Map<String, Int>) =
|
fun getCompileBenchmarkTime(programName: String, tasksNames: Iterable<String>, repeats: Int, exitCodes: Map<String, Int>) =
|
||||||
|
|||||||
@@ -19,6 +19,13 @@ private def determinePreset() {
|
|||||||
preset
|
preset
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getMingwPath() {
|
||||||
|
def directory = System.getenv("MINGW64_DIR")
|
||||||
|
if (directory == null)
|
||||||
|
directory = "c:/msys64/mingw64"
|
||||||
|
return directory
|
||||||
|
}
|
||||||
|
|
||||||
def hostPreset = determinePreset()
|
def hostPreset = determinePreset()
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
@@ -62,7 +69,7 @@ kotlin {
|
|||||||
binaries {
|
binaries {
|
||||||
executable('benchmark', [RELEASE]) {
|
executable('benchmark', [RELEASE]) {
|
||||||
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
|
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
|
||||||
linkerOpts("-L${getMingwPath()}/lib")
|
linkerOpts = ["-L${getMingwPath()}/lib".toString()]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ kotlin {
|
|||||||
|
|
||||||
fromPreset(presets.mingwX64, 'windows') {
|
fromPreset(presets.mingwX64, 'windows') {
|
||||||
binaries.all {
|
binaries.all {
|
||||||
linkerOpts = ["-L${getMingwPath()}/lib"]
|
linkerOpts = ["-L${getMingwPath()}/lib".toString()]
|
||||||
}
|
}
|
||||||
compilations.main.cinterops {
|
compilations.main.cinterops {
|
||||||
libcurl {
|
libcurl {
|
||||||
|
|||||||
Reference in New Issue
Block a user