Skip to content

Commit e8fb849

Browse files
committed
Fix dotr script: add JLine jars to the classpath
1 parent b055bc4 commit e8fb849

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

dist/bin/common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ SCALA_ASM=$(find_lib "*scala-asm*")
119119
SCALA_LIB=$(find_lib "*scala-library*")
120120
SCALA_XML=$(find_lib "*scala-xml*")
121121
SBT_INTF=$(find_lib "*compiler-interface*")
122+
JLINE=$(find_lib "*jline*")
122123

123124
# debug
124125
DEBUG_STR=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005

dist/bin/dotc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ classpathArgs () {
6363
toolchain+="$SBT_INTF$PSEP"
6464
toolchain+="$DOTTY_INTF$PSEP"
6565
toolchain+="$DOTTY_LIB$PSEP"
66-
toolchain+="$DOTTY_COMP"
66+
toolchain+="$DOTTY_COMP$PSEP"
67+
68+
# JLine is mutiple jars
69+
local all_jline=$(echo "$JLINE" | tr " " "$PSEP")
70+
toolchain+="$all_jline"
6771

6872
if [[ -n "$bootcp" ]]; then
6973
jvm_cp_args="-Xbootclasspath/a:\"$toolchain\""

0 commit comments

Comments
 (0)