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

Fix setting custom path to .konan for Windows

Browse Source
This commit is contained in:
Ilya Matveev
2018-04-16 22:31:33 +07:00
committed by ilmat192
parent 1b22d34852
commit 9e1e7559a2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/run_konan.bat
+2 -1
View File
@@ -94,7 +94,8 @@ goto :eof
:set_path :set_path
rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded. rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded.
rem TODO: remove this hack. rem TODO: remove this hack.
set "PATH=%USERPROFILE%\.konan\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%" if ("%KONAN_DATA_DIR%"=="") (set KONAN_DATA_DIR=%USERPROFILE%\.konan)
set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
goto :eof goto :eof
:end :end
samples/zephyr/build.bat
+1 -1
View File
@@ -6,7 +6,7 @@ set ZEPHYR_BASE=%userprofile%\zephyr
set TOOLCHAIN=gcc-arm-none-eabi-7-2017-q4-major-win32 set TOOLCHAIN=gcc-arm-none-eabi-7-2017-q4-major-win32
set DIR=%~dp0 set DIR=%~dp0
if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR="%HOME%\.konan") if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR=%userprofile%\.konan)
set KONAN_DEPS=%KONAN_DATA_DIR%/dependencies set KONAN_DEPS=%KONAN_DATA_DIR%/dependencies
set GCC_ARM=%KONAN_DEPS%/%TOOLCHAIN% set GCC_ARM=%KONAN_DEPS%/%TOOLCHAIN%
set ZEPHYR_TOOLCHAIN_VARIANT=gccarmemb set ZEPHYR_TOOLCHAIN_VARIANT=gccarmemb