Skip to content

Commit d251345

Browse files
Backport "expand classpath of pathing jars in scala_legacy command" to 3.5.1 (#21184)
Backports #21160 to 3.5.1-RC1 as a follow up to #21183
2 parents 4ccb020 + 418106b commit d251345

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dist/bin/scala_legacy

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ done
6565
# exec here would prevent onExit from being called, leaving terminal in unusable state
6666
compilerJavaClasspathArgs
6767
[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
68-
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
68+
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "-Dscala.expandjavacp=true" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
6969
scala_exit_status=$?
7070

7171

0 commit comments

Comments
 (0)