From 1502e6628bfa2d40ec7ad9a724cedf0b6979d401 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 18 Aug 2022 13:50:36 +0200 Subject: [PATCH] [K/N][perf] Workaround KGP bug when dirs are queried instantly --- .../tools/benchmarksAnalyzer/build.gradle | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/kotlin-native/tools/benchmarksAnalyzer/build.gradle b/kotlin-native/tools/benchmarksAnalyzer/build.gradle index 4b6d01d5c8f..dc9507a985d 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/build.gradle +++ b/kotlin-native/tools/benchmarksAnalyzer/build.gradle @@ -1,10 +1,12 @@ +import org.jetbrains.kotlin.konan.target.HostManager + buildscript { ext.rootBuildDirectory = file('../..') ext { def properties = new java.util.Properties() properties.load(new java.io.FileReader(project.file("$rootBuildDirectory/../gradle.properties"))) - properties.each { k, v-> + properties.each { k, v -> def key = k as String def value = project.findProperty(key) ?: v project.logger.info("${project.name} $key: $value") @@ -115,35 +117,42 @@ kotlin { } } - fromPreset(presets.mingwX64, 'windows') { - binaries.all { - linkerOpts = ["-L${getMingwPath()}/lib".toString()] - } - compilations.main.cinterops { - libcurl { - includeDirs.headerFilterOnly "${getMingwPath()}/include" + if (HostManager.hostIsMingw) { + fromPreset(presets.mingwX64, 'windows') { + binaries.all { + linkerOpts = ["-L${getMingwPath()}/lib".toString()] + } + compilations.main.cinterops { + libcurl { + includeDirs.headerFilterOnly "${getMingwPath()}/include" + } } } } - fromPreset(presets.linuxX64, 'linux') { - compilations.main.cinterops { - libcurl { - includeDirs.headerFilterOnly '/usr/include', '/usr/include/x86_64-linux-gnu' + if (HostManager.hostIsLinux) { + fromPreset(presets.linuxX64, 'linux') { + compilations.main.cinterops { + libcurl { + includeDirs.headerFilterOnly '/usr/include', '/usr/include/x86_64-linux-gnu' + } } } } - fromPreset(presets.macosX64, 'macosX64') { - compilations.main.cinterops { - libcurl { - includeDirs.headerFilterOnly '/opt/local/include', '/usr/local/include' + + if (HostManager.hostIsMac) { + fromPreset(presets.macosX64, 'macosX64') { + compilations.main.cinterops { + libcurl { + includeDirs.headerFilterOnly '/opt/local/include', '/usr/local/include' + } } } - } - fromPreset(presets.macosArm64, 'macosArm64') { - compilations.main.cinterops { - libcurl { - includeDirs.headerFilterOnly '/opt/local/include', '/usr/local/include' + fromPreset(presets.macosArm64, 'macosArm64') { + compilations.main.cinterops { + libcurl { + includeDirs.headerFilterOnly '/opt/local/include', '/usr/local/include' + } } } } @@ -153,7 +162,7 @@ kotlin { } } - configure([findByName('windows'), findByName('linux'), findByName('macosX64'), findByName('macosArm64')]) { + configure([findByName('windows'), findByName('linux'), findByName('macosX64'), findByName('macosArm64')].findAll { it != null }) { def isCurrentHost = (name == getHostName()) compilations.all { cinterops.all {