diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 10:30:16 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 10:30:16 -0700 |
| commit | cdac91ef7507831b795dc8124421dded82224e5f (patch) | |
| tree | 140141a10c4c3dde8d4ae70a33e6ba02a14aebeb /src | |
| parent | a910d0caf0fd4464378fa9c629730acce50eabb8 (diff) | |
| parent | 34e1a834816d53ff529bbb2ac6c89f0bcbd74bf6 (diff) | |
| download | scala-cdac91ef7507831b795dc8124421dded82224e5f.tar.gz scala-cdac91ef7507831b795dc8124421dded82224e5f.tar.bz2 scala-cdac91ef7507831b795dc8124421dded82224e5f.zip | |
Merge pull request #3608 from adriaanm/t8368
SI-8368 respect user-supplied -Dscala.usejavacp in unix runner
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 8 |
1 files changed, 7 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 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@ "$@@" |