Merge pull request scala#13759 from philwalk/set-system-property-scal…

…a.home provide scala.home setting for scripts - fix for scala#13758
rolang · Oct 18, 2021 · adfe16c · adfe16c
2 parents 54ff628 + ae03590
commit adfe16c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dist/bin/scala b/dist/bin/scala
@@ -31,7 +31,7 @@ source "$PROG_HOME/bin/common"
 # 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\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "$@"
+eval "\"$JAVACMD\"" "-Dscala.home=$PROG_HOME" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "$@"
 scala_exit_status=$?