From beecc49add70a359d9e8f4b6807ee29e5e8ffe36 Mon Sep 17 00:00:00 2001
From: michelou <michelou@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date: Tue, 10 Mar 2009 10:43:54 +0000
Subject: [PATCH] modified JAVA_OPTS setting

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@17273 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
---
 OMakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OMakefile b/OMakefile
index ba6f08750..29f061648 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