From 843b6a2abbab886f850ed628f6c70a93b05238dc Mon Sep 17 00:00:00 2001 From: Luc Henninger Date: Wed, 20 Jan 2021 00:43:10 +0100 Subject: [PATCH 1/2] Add JNA lib to be used with JLINE_TERMINAL_JNA --- dist/bin/scalac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/bin/scalac b/dist/bin/scalac index 148a7b8cfbba..a03601e4fcee 100755 --- a/dist/bin/scalac +++ b/dist/bin/scalac @@ -73,7 +73,8 @@ classpathArgs () { # jine toolchain+="$JLINE_READER$PSEP" toolchain+="$JLINE_TERMINAL$PSEP" - toolchain+="$JLINE_TERMINAL_JNA" + toolchain+="$JLINE_TERMINAL_JNA$PSEP" + toolchain+="$JNA" jvm_cp_args="-classpath \"$toolchain\"" } From ba948788487bf50059e4fc5ed2579802c029891f Mon Sep 17 00:00:00 2001 From: Luc Henninger Date: Wed, 20 Jan 2021 00:50:14 +0100 Subject: [PATCH 2/2] Update common --- dist/bin/common | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/bin/common b/dist/bin/common index ddf949b11a04..eaa9376fe90e 100755 --- a/dist/bin/common +++ b/dist/bin/common @@ -116,6 +116,7 @@ SBT_INTF=$(find_lib "*compiler-interface*") JLINE_READER=$(find_lib "*jline-reader-3*") JLINE_TERMINAL=$(find_lib "*jline-terminal-3*") JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*") +JNA=$(find_lib "*jna-5*") # debug DEBUG_STR=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005