Native: switch CLI compiler and tools to embeddable compiler jar
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:
committed by
Space
parent
4f4755a976
commit
0c6421d53f
@@ -74,7 +74,7 @@ while IFS=$'\r' read -r line || [[ -n "$line" ]]; do
|
||||
unset $line
|
||||
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"
|
||||
KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR"
|
||||
TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
|
||||
|
||||
@@ -53,7 +53,7 @@ if not "!ARG!" == "" (
|
||||
|
||||
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 "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%"
|
||||
|
||||
Reference in New Issue
Block a user