From 243fd8836a62a329f818ddbaa3b222c223a8777f Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 1 Nov 2017 20:49:54 +0000 Subject: Fix default bootstrap JDK selection. It was accidentally broken by r450869. --- java/openjdk8/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/openjdk8/Makefile') diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 3edf86d41bfa..ff01d070ca50 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -305,6 +305,8 @@ TOOLS_DIR+= ${${t}:S|/${BUILD_${t}}$||} CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /:/g}" .endif +.include + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ ${LOCALBASE}/openjdk7 \ ${LOCALBASE}/bootstrap-openjdk8 @@ -322,8 +324,6 @@ BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk8 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8 .endif -.include - .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 # XXX We must limit max heap size for 32-bit targets. CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" -- cgit v1.2.3