From 34e1a834816d53ff529bbb2ac6c89f0bcbd74bf6 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 7 Mar 2014 10:43:03 -0800
Subject: SI-8368 respect user-supplied -Dscala.usejavacp in unix runner

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

(limited to 'src')

diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 88fee71843..194d92367b 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -144,6 +144,10 @@ classpathArgs () {
   fi
 }
 
+# SI-8358, SI-8368 -- the default should really be false,
+# but I don't want to flip the default during 2.11's RC cycle
+OVERRIDE_USEJAVACP="-Dscala.usejavacp=true"
+
 while [[ $# -gt 0 ]]; do
   case "$1" in
     -D*)
@@ -151,6 +155,8 @@ while [[ $# -gt 0 ]]; do
       # need it, e.g. communicating with a server compiler.
       java_args=("${java_args[@@]}" "$1")
       scala_args=("${scala_args[@@]}" "$1")
+      # respect user-supplied -Dscala.usejavacp
+      case "$1" in -Dscala.usejavacp) OVERRIDE_USEJAVACP="" esac
       shift
       ;;
     -J*)
@@ -199,7 +205,7 @@ execCommand \
   "${java_args[@@]}" \
   $(classpathArgs) \
   -Dscala.home="$SCALA_HOME" \
-  -Dscala.usejavacp=true \
+  $OVERRIDE_USEJAVACP \
   "$EMACS_OPT" \
   $WINDOWS_OPT \
   @properties@ @class@ @toolflags@ "$@@"
-- 
cgit v1.2.3