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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 4a15430d50..198e764e05 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -26,7 +26,7 @@ if "%_JAVACMD%"=="" set _JAVACMD=java set _EXTENSION_CLASSPATH=@extclasspath@ if "%_EXTENSION_CLASSPATH%"=="" ( - for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" + for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" ) set _BOOT_CLASSPATH=@bootclasspath@ @@ -34,6 +34,9 @@ if "%_BOOT_CLASSPATH%"=="" ( if exist "%_SCALA_HOME%\lib\scala-library.jar" ( set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\scala-library.jar ) + if exist "%_SCALA_HOME%\lib\library" ( + set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\library + ) ) set _MYCLASSPATH=%_EXTENSION_CLASSPATH% |