diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 605bb6bf4693..11f85238a420 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -289,6 +289,7 @@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@ +export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ diff --git a/configure.ac b/configure.ac index af2bda898352..f4f6ceb6786c 100644 --- a/configure.ac +++ b/configure.ac @@ -6715,6 +6715,8 @@ you must use the "--with-jdk-home" configure option explicitly]) # set to limit VM usage for JunitTests JAVAIFLAGS=-Xmx64M + # set to limit VM usage for javac + JAVAFLAGS=-J-Xmx128M fi else AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4]) @@ -7033,6 +7035,7 @@ AC_SUBST(JAVACOMPILER) AC_SUBST(JAVADOC) AC_SUBST(JAVAINTERPRETER) AC_SUBST(JAVAIFLAGS) +AC_SUBST(JAVAFLAGS) AC_SUBST(JAVA_CLASSPATH_NOT_SET) AC_SUBST(JAVA_HOME) AC_SUBST(JAVA_SOURCE_VER) |