Merge pull request #11172 from flomebul/patch-2

Add JNA lib to be used with JLINE_TERMINAL_JNA

Author: liufengyun

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

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\""
 }