diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 1072d7492c32..078431d0c568 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -104,8 +104,11 @@ JDK_BUILD_TYPE= release .include -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 \ - ${LOCALBASE}/openjdk16 +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 +.if ${ARCH} == aarch64 || ${ARCH} == amd64 +BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 +.endif +BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk16 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} @@ -116,8 +119,13 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) +. if ${ARCH} == aarch64 || ${ARCH} == amd64 +BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 +. else BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16 +. endif .endif JDK_BUILD_JVM= server