diff options
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-windows.tmpl')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 21651831df..e88a9730e8 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -21,7 +21,7 @@ set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" (
if not "%JAVA_HOME%"=="" (
- if exist "%JAVA_HOME%\bin\java.exe" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+ if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe"
)
)
@@ -37,7 +37,7 @@ if "%_TOOL_CLASSPATH%"=="" ( for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f"
)
-set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.emacs="%EMACS%" @properties@
+set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@
rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
|