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

Native: switch CLI compiler and tools to embeddable compiler jar

Browse Source 
To keep it consistent with Gradle plugin. See ^KT-48595
CLI compiler launched with arguments obtained from Gradle log
should be able to handle plugins.
This commit is contained in:
Svyatoslav Scherbina
2022-02-15 14:35:07 +00:00
committed by Space
parent 4f4755a976
commit 0c6421d53f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/cmd/run_konan
+1 -1
View File
@@ -74,7 +74,7 @@ while IFS=$'\r' read -r line || [[ -n "$line" ]]; do
unset $line unset $line
done < "${KONAN_HOME}/tools/env_blacklist" done < "${KONAN_HOME}/tools/env_blacklist"
KONAN_JAR="${KONAN_HOME}/konan/lib/kotlin-native.jar" KONAN_JAR="${KONAN_HOME}/konan/lib/kotlin-native-compiler-embeddable.jar"
TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar" TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar"
KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR" KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR"
TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
kotlin-native/cmd/run_konan.bat
+1 -1
View File
@@ -53,7 +53,7 @@ if not "!ARG!" == "" (
set "KONAN_LIB=%_KONAN_HOME%\konan\lib" set "KONAN_LIB=%_KONAN_HOME%\konan\lib"
set "KONAN_JAR=%KONAN_LIB%\kotlin-native.jar" set "KONAN_JAR=%KONAN_LIB%\kotlin-native-compiler-embeddable.jar"
set TROVE_JAR="%KONAN_LIB%\trove4j.jar" set TROVE_JAR="%KONAN_LIB%\trove4j.jar"
set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%" set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%"