From 0c6421d53fd44fd2c50a0e357306d267b47674ea Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Tue, 15 Feb 2022 14:35:07 +0000 Subject: [PATCH] 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. --- kotlin-native/cmd/run_konan | 2 +- kotlin-native/cmd/run_konan.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin-native/cmd/run_konan b/kotlin-native/cmd/run_konan index 8a0304d6586..fdddd50a0d7 100755 --- a/kotlin-native/cmd/run_konan +++ b/kotlin-native/cmd/run_konan @@ -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 diff --git a/kotlin-native/cmd/run_konan.bat b/kotlin-native/cmd/run_konan.bat index 229128469f2..4bf61af4a1a 100644 --- a/kotlin-native/cmd/run_konan.bat +++ b/kotlin-native/cmd/run_konan.bat @@ -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%"