jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[K/N] Update usages of LLVM bin directory on Windows

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-07-29 14:24:39 +07:00
committed by Space
parent 7d8360f38b
commit 84d06f35e9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin-native/cmd/run_konan.bat
View File

@@ -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

2
kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
View File

@@ -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")}")
}
}