Skip to content

Commit

Permalink
Backport "expand classpath of pathing jars in scala_legacy command" t…
Browse files Browse the repository at this point in the history
…o 3.5.1 (#21184)

Backports #21160 to 3.5.1-RC1 as a follow up to #21183
  • Loading branch information
WojciechMazur authored Jul 14, 2024
2 parents 4ccb020 + 418106b commit d251345
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dist/bin/scala_legacy
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ done
# exec here would prevent onExit from being called, leaving terminal in unusable state
compilerJavaClasspathArgs
[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "-Dscala.expandjavacp=true" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
scala_exit_status=$?


Expand Down

0 comments on commit d251345

Please sign in to comment.