diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-27 16:29:29 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-27 16:31:27 -0800 |
| commit | 07ffa8d66dedcf2bf2ac26d5e31f09922f5479ce (patch) | |
| tree | d3cdfb3991911c56b2482e669b517ab1cd9bae9c /src/compiler/scala/tools/ant/templates/tool-unix.tmpl | |
| parent | 41b3013f347273f1a1d066ee7cd1027e9fad3bce (diff) | |
| download | scala-07ffa8d66dedcf2bf2ac26d5e31f09922f5479ce.tar.gz scala-07ffa8d66dedcf2bf2ac26d5e31f09922f5479ce.tar.bz2 scala-07ffa8d66dedcf2bf2ac26d5e31f09922f5479ce.zip | |
Fix for "." appearing on classpath.
Have to pass an empty classpath to java if we put the boot libs
on the classpath, otherwise it puts the default "." on there.
Closes SI-5528.
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-unix.tmpl')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 7e51930fa4..599936f6f8 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -128,9 +128,11 @@ if [[ -z "$cygwin$mingw" ]]; then usebootcp="true" fi +# If using the boot classpath, also pass an empty classpath +# to java to suppress "." from materializing. classpathArgs () { if [[ -n $usebootcp ]]; then - echo "-Xbootclasspath/a:$TOOL_CLASSPATH" + echo "-Xbootclasspath/a:$TOOL_CLASSPATH -classpath \"\"" else echo "-classpath $TOOL_CLASSPATH" fi |