From 719549799ef6ac85f181ae607b0f174601d634fd Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Tue, 16 Aug 2011 16:53:29 +0000
Subject: Looks like I broke -nobootcp at some point.

---
 src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 354a8c3644..72d6ba1bab 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -111,6 +111,7 @@ declare -a scala_args
 
 # default to the boot classpath for speed.
 CPSELECT="-Xbootclasspath/a:"
+USEJAVACP=false
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -134,6 +135,7 @@ while [ $# -gt 0 ]; do
       ;;
     -nobootcp)
       CPSELECT="-classpath "
+      USEJAVACP=true
       shift
       ;;
     *)
@@ -154,7 +156,7 @@ fi
   $JAVA_OPTS \
   "${java_args[@@]}" \
   ${CPSELECT}${TOOL_CLASSPATH} \
-  -Dscala.usejavacp=false \
+  -Dscala.usejavacp="$USEJAVACP" \
   -Dscala.home="$SCALA_HOME" \
   -Denv.emacs="$EMACS" \
   $CYGWIN_JLINE_TERMINAL \
-- 
cgit v1.2.3