[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Michael Stahl]

 config_host.mk.in |    1 +
 configure.ac      |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 13cb02ce1046779864109646a105c09c2e27249a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 29 17:35:57 2014 +0200

    configure: limit javac VM usage
    
    Similarly, restrict javac to 128M, which is enough for me with JDK 1.7
    on Linux x86_64.
    
    Change-Id: I5b1e3435026b8b69bf7afe8b5236c3dc09857f49

diff --git a/config_host.mk.in b/config_host.mk.in
index 605bb6b..11f8523 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 af2bda8..f4f6ceb 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)