summaryrefslogtreecommitdiff
path: root/OMakefile
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2009-03-10 10:43:54 +0000
committermichelou <michelou@epfl.ch>2009-03-10 10:43:54 +0000
commit5e2dd3850dd6da531b4e9ba7075081aae65a1502 (patch)
treed9b666f2d742947d762815314a4f47b11ea80d76 /OMakefile
parent717e797c254be59dfe70bac376e202edf53519a9 (diff)
downloadscala-5e2dd3850dd6da531b4e9ba7075081aae65a1502.tar.gz
scala-5e2dd3850dd6da531b4e9ba7075081aae65a1502.tar.bz2
scala-5e2dd3850dd6da531b4e9ba7075081aae65a1502.zip
modified JAVA_OPTS setting
Diffstat (limited to 'OMakefile')
-rw-r--r--OMakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/OMakefile b/OMakefile
index ba6f087508..29f0616480 100644
--- a/OMakefile
+++ b/OMakefile
@@ -8,7 +8,7 @@ JAVAC = $(getenv JAVAC, $(JAVA_HOME)$(DIRSEP)bin$(DIRSEP)javac)
JAVAP = $(JAVA_HOME)$(DIRSEP)bin$(DIRSEP)javap
# Default options for the JVM
-JAVA_OPTS = -Xms1024M -Xmx1024M -XX:MaxPermSize=256M
+JAVA_OPTS = $(getenv JAVA_OPTS, -Xms1024M -Xmx1024M -XX:MaxPermSize=256M)
DIFF=diff
DIFF_OPTS=-r