diff options
| author | jkim <jkim@FreeBSD.org> | 2017-11-02 04:49:54 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2017-11-02 04:49:54 +0800 |
| commit | 817dcc7a9ebd5f429ca8a0c4c0b446e7d4ad12b3 (patch) | |
| tree | b06d0fd7fb8c0b9054e97f77ecc4eda9c25bad7e /java | |
| parent | eff96358d0a883742b530350fcd4e661445892ab (diff) | |
| download | freebsd-ports-gnome-817dcc7a9ebd5f429ca8a0c4c0b446e7d4ad12b3.tar.gz freebsd-ports-gnome-817dcc7a9ebd5f429ca8a0c4c0b446e7d4ad12b3.tar.zst freebsd-ports-gnome-817dcc7a9ebd5f429ca8a0c4c0b446e7d4ad12b3.zip | |
Fix default bootstrap JDK selection.
It was accidentally broken by r450869.
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk8/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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 <bsd.port.pre.mk> + 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 <bsd.port.pre.mk> - .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" |