summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-04-27 09:31:57 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-04-27 09:31:57 +0200
commit48f4a99fc7c0c6d14e7bb1ec3dcca88e3ff0b121 (patch)
tree69999a9b40100adb3b64af9b1b7d8050c507a76c
parentd030172d7ef807d85391d32c5456b1b97b15a402 (diff)
parent8559e39c8dc2a597a210ebf9b4ee7ea2247e2d62 (diff)
downloadscala-48f4a99fc7c0c6d14e7bb1ec3dcca88e3ff0b121.tar.gz
scala-48f4a99fc7c0c6d14e7bb1ec3dcca88e3ff0b121.tar.bz2
scala-48f4a99fc7c0c6d14e7bb1ec3dcca88e3ff0b121.zip
Merge pull request #4465 from retronym/ticket/9279
SI-9279 Improve performance of bash runner script
-rwxr-xr-xsrc/compiler/scala/tools/ant/templates/tool-unix.tmpl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 9862ea7987..6e91a2a202 100755
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -137,8 +137,8 @@ while [[ $# -gt 0 ]]; do
-D*)
# pass to scala as well: otherwise we lose it sometimes when we
# need it, e.g. communicating with a server compiler.
- java_args=("${java_args[@@]}" "$1")
- scala_args=("${scala_args[@@]}" "$1")
+ java_args+=("$1")
+ scala_args+=("$1")
# respect user-supplied -Dscala.usejavacp
case "$1" in -Dscala.usejavacp*) OVERRIDE_USEJAVACP="";; esac
shift
@@ -146,8 +146,8 @@ while [[ $# -gt 0 ]]; do
-J*)
# as with -D, pass to scala even though it will almost
# never be used.
- java_args=("${java_args[@@]}" "${1:2}")
- scala_args=("${scala_args[@@]}" "$1")
+ java_args+=("${1:2}")
+ scala_args+=("$1")
shift
;;
-toolcp)
@@ -167,7 +167,7 @@ while [[ $# -gt 0 ]]; do
shift
;;
*)
- scala_args=("${scala_args[@@]}" "$1")
+ scala_args+=("$1")
shift
;;
esac