diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 36f1616dd53..40a9146d628 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -192,13 +192,11 @@ final List stdLibSrc = [ ] // These files are built before the 'dist' is complete, -// so we provide custom values for -// konan.home, --runtime, -Djava.library.path etc +// so we provide custom values for konan.home, --runtime etc targetList.each { target -> def konanJvmArgs = [*HostManager.regularJvmArgs, - "-Dkonan.home=${rootProject.projectDir}/dist", - "-Djava.library.path=${project.buildDir}/nativelibs/$hostName", + "-Dkonan.home=${rootProject.projectDir}/dist" ] def defaultArgs = ['-nopack', '-nostdlib', '-no-default-libs', '-no-endorsed-libs'] @@ -295,8 +293,7 @@ task debugCompiler(type: JavaExec) { classpath = project.fileTree("${distDir.canonicalPath}/konan/lib/") { include '*.jar' } - jvmArgs "-Dorg.jetbrains.kotlin.native.home=${distDir.canonicalPath}", - "-Djava.library.path=${distDir.canonicalPath}/konan/nativelib" + jvmArgs "-Dorg.jetbrains.kotlin.native.home=${distDir.canonicalPath}" enableAssertions = true args = findProperty("konan.debug.args").toString().tokenize() ?: [] } diff --git a/backend.native/debugger-tests/build.gradle b/backend.native/debugger-tests/build.gradle index 750b28b4728..31bf8532f55 100644 --- a/backend.native/debugger-tests/build.gradle +++ b/backend.native/debugger-tests/build.gradle @@ -13,8 +13,7 @@ test { def dist = project.rootProject.file("dist").canonicalPath systemProperties = [ - 'org.jetbrains.kotlin.native.home': dist, - 'java.library.path': "$dist/konan/nativelib" + 'org.jetbrains.kotlin.native.home': dist ] } test.dependsOn ':dist' \ No newline at end of file diff --git a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 19b83731ee7..959610072ac 100644 --- a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -79,8 +79,7 @@ class RunExternalTestGroup extends JavaExec { classpath = project.fileTree("$dist.canonicalPath/konan/lib/") { include '*.jar' } - jvmArgs "-Dkonan.home=${dist.canonicalPath}", "-Xmx4G", - "-Djava.library.path=${dist.canonicalPath}/konan/nativelib" + jvmArgs "-Dkonan.home=${dist.canonicalPath}", "-Xmx4G" enableAssertions = true def sources = File.createTempFile(name,".lst") sources.deleteOnExit() diff --git a/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy index d7e73fa50ce..240448a3ea9 100644 --- a/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy +++ b/build-tools/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy @@ -307,15 +307,5 @@ class NativeInteropPlugin implements Plugin { interopStubGenerator project(path: ":Interop:StubGenerator") interopStubGenerator project(path: ":endorsedLibraries:kotlinx.cli", configuration: "jvmRuntimeElements") } - - // FIXME: choose tasks more wisely - prj.tasks.withType(JavaExec) { - if (!name.endsWith("InteropStubs")) { - systemProperties "java.library.path": prj.files( - nativeLibsDir, - runtimeNativeLibsDir - ).asPath - } - } } } diff --git a/cmd/run_konan b/cmd/run_konan index 753468bde92..68577a3fb75 100755 --- a/cmd/run_konan +++ b/cmd/run_konan @@ -67,7 +67,6 @@ NATIVE_LIB="${KONAN_HOME}/konan/nativelib" java_opts=(-ea \ -Xmx3G \ -XX:TieredStopAtLevel=1 \ - "-Djava.library.path=${NATIVE_LIB}" \ "-Dkonan.home=${KONAN_HOME}" \ -Dfile.encoding=UTF-8 \ ${JAVA_OPTS}) diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat index 6b9a02a22e0..31d5c6b801a 100644 --- a/cmd/run_konan.bat +++ b/cmd/run_konan.bat @@ -62,7 +62,6 @@ set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%" set JAVA_OPTS=-ea ^ -Xmx3G ^ -XX:TieredStopAtLevel=1 ^ - "-Djava.library.path=%NATIVE_LIB%" ^ "-Dkonan.home=%_KONAN_HOME%" ^ -Dfile.encoding=UTF-8 ^ %JAVA_OPTS% diff --git a/endorsedLibraries/kotlinx.cli/build.gradle b/endorsedLibraries/kotlinx.cli/build.gradle index 20d29f2049a..f9b975ff83d 100644 --- a/endorsedLibraries/kotlinx.cli/build.gradle +++ b/endorsedLibraries/kotlinx.cli/build.gradle @@ -74,7 +74,6 @@ def nativeSrc = new File("$projectDir/src/main/kotlin-native") targetList.each { target -> def konanJvmArgs = [*HostManager.regularJvmArgs, "-Dkonan.home=${rootProject.projectDir}/dist", - "-Djava.library.path=${project.buildDir}/nativelibs/$hostName", ] def defaultArgs = ['-nopack', '-no-default-libs', '-no-endorsed-libs'] diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt index fbdfa56047a..c5561933e1e 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt @@ -71,8 +71,7 @@ internal abstract class KonanCliRunner( } override val additionalSystemProperties = mutableMapOf( - "konan.home" to konanHome, - "java.library.path" to "$konanHome/konan/nativelib" + "konan.home" to konanHome ) override val environment = mutableMapOf("LIBCLANG_DISABLE_CRASH_RECOVERY" to "1")