summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-12-10 19:37:07 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-12-10 19:37:07 +0000
commit5b1ddddad1ecca7419fa40d6b0795cd8fa4e6675 (patch)
tree038da32d84eed332451d70a80acba7b7787d0575 /java
parentFix regression introduced in r372338, i.e., mis-merged fix for JDK-8031581. (diff)
Work around build failures with Poudriere. We have to limit max heap size
when building 32-bit targets on a 64-bit host for some unknown reason.
Notes
Notes: svn path=/head/; revision=403465
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 2d35db52f145..c519e7ef4b4d 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -270,6 +270,12 @@ AUTOCONF_ARGS= -I . -o generated-configure.sh generated-configure.ac
.include <bsd.port.pre.mk>
+.if ${ARCH:Marmv6*} || ${ARCH} == "i386"
+# XXX We must limit max heap size for 32-bit targets.
+CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m"
+MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m"
+.endif
+
.if ${ARCH} == "armv6"
# From NetBSD http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/lang/openjdk7/hacks.mk
# Workaround incorrect constant folding of subnormals in javac when the FPU