diff options
| author | michelou <michelou@epfl.ch> | 2007-10-02 15:40:31 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-10-02 15:40:31 +0000 |
| commit | 2fef21d33ea8cef84d8adf4b9122bc400789d050 (patch) | |
| tree | 61ba0594d68c7d5147f884bdc9554bfe22852e1b /src/compiler/scala/tools/ant/templates/tool-unix.tmpl | |
| parent | 3e458ce8dde26e13db39f84b1ef50574eb04a9ee (diff) | |
| download | scala-2fef21d33ea8cef84d8adf4b9122bc400789d050.tar.gz scala-2fef21d33ea8cef84d8adf4b9122bc400789d050.tar.bz2 scala-2fef21d33ea8cef84d8adf4b9122bc400789d050.zip | |
fixed ticket #142
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-unix.tmpl')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 5 |
1 files changed, 4 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 69040dc9e8..d963d18873 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -70,4 +70,7 @@ if $cygwin; then BOOT_CLASSPATH=`cygpath --path --$format "$BOOT_CLASSPATH"` fi -${JAVACMD:=java} ${JAVA_OPTS:=@javaflags@} -Xbootclasspath/a:"$BOOT_CLASSPATH" -cp "$EXTENSION_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" +# Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris +[ -n "$JAVA_OPTS" ] || JAVA_OPTS="@javaflags@" + +${JAVACMD:=java} $JAVA_OPTS -Xbootclasspath/a:"$BOOT_CLASSPATH" -cp "$EXTENSION_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" |