Skip to content

Commit 7a80060

Browse files
liufengyunallanrenucci
authored andcommitted
fix cygwin which has problem with unix pipes
1 parent a05b0e5 commit 7a80060

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

dist/bin/common

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ 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*")
122+
JLINE=$(find_lib "*jline-3*")
123+
JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
124+
JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
123125

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

dist/bin/dotc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ classpathArgs () {
6565
toolchain+="$DOTTY_LIB$PSEP"
6666
toolchain+="$DOTTY_COMP$PSEP"
6767

68-
# JLine is mutiple jars
69-
local all_jline=$(echo "$JLINE" | tr " " "$PSEP")
70-
toolchain+="$all_jline"
68+
# jine
69+
toolchain+="$JLINE$PSEP"
70+
toolchain+="$JLINE_TERMINAL$PSEP"
71+
toolchain+="$JLINE_TERMINAL_JNA"
7172

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

0 commit comments

Comments
 (0)