diff options
| author | Paul Phillips <paulp@improving.org> | 2011-08-16 16:53:29 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-08-16 16:53:29 +0000 |
| commit | 719549799ef6ac85f181ae607b0f174601d634fd (patch) | |
| tree | 51383051b2aaf258d64d1200860ae72e94492c99 /src/compiler/scala/tools/ant/templates | |
| parent | d8359a20a088a4724431ce9c7dd93869c2ad23cb (diff) | |
| download | scala-719549799ef6ac85f181ae607b0f174601d634fd.tar.gz scala-719549799ef6ac85f181ae607b0f174601d634fd.tar.bz2 scala-719549799ef6ac85f181ae607b0f174601d634fd.zip | |
Looks like I broke -nobootcp at some point.
Diffstat (limited to 'src/compiler/scala/tools/ant/templates')
| -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 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 \ |