From 84d06f35e97df7dc97768d4edc3ed4f50a5a9d1c Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 29 Jul 2021 14:24:39 +0700 Subject: [PATCH] [K/N] Update usages of LLVM bin directory on Windows --- kotlin-native/cmd/run_konan.bat | 2 +- .../org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin-native/cmd/run_konan.bat b/kotlin-native/cmd/run_konan.bat index 1ae0043c403..229128469f2 100644 --- a/kotlin-native/cmd/run_konan.bat +++ b/kotlin-native/cmd/run_konan.bat @@ -84,7 +84,7 @@ goto :eof rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded. rem TODO: remove this hack. if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR=%USERPROFILE%\.konan) - set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1\bin;%PATH%" + set "PATH=%KONAN_DATA_DIR%\dependencies\llvm-11.1.0-windows-x64\bin;%PATH%" goto :eof :end diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt index a9ec7f0b1ef..9f8088bb3c2 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt @@ -127,7 +127,7 @@ internal class KonanInteropRunner( if (HostManager.host == KonanTarget.MINGW_X64) { //TODO: Oh-ho-ho fix it in more convinient way. environment.put("PATH", DependencyProcessor.defaultDependenciesRoot.absolutePath + - "\\msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1" + + "\\llvm-11.1.0-windows-x64" + "\\bin;${environment.get("PATH")}") } }