diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-07-23 07:02:22 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-07-23 07:02:22 +0000 |
| commit | 43227170653e0e17bb24f5a8734c79091857f26d (patch) | |
| tree | d0a90fcfdbadadda2740024a87851173e33c4c3d /java | |
| parent | Update to 1.00. (diff) | |
. Default to using jbootstrap as the bootstrap, not linux-blackdown-jdk13.
PR: 83758
Notes
Notes:
svn path=/head/; revision=139945
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk13/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index dd289fae4f79..e74d24c6d7db 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -112,19 +112,17 @@ LD_LIBRARY_PATH_FILES= ../src/solaris/javavm/runtime/javai_md.c \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 && !exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac) -WITH_LINUX_BOOTSTRAP=yes -.endif - .if !defined(JDK13DIR) .if defined(WITH_LINUX_BOOTSTRAP) JDK13DIR= ${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION} BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk13 -.elif exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac) +.elif exists(${LOCALBASE}/jdk${JDK_VERSION}/bin/javac) JDK13DIR= ${LOCALBASE}/jdk${JDK_VERSION} -.else +.elif exists(${LOCALBASE}/diablo-jdk${JDK_VERSION}/bin/javac) JDK13DIR= ${LOCALBASE}/diablo-jdk${JDK_VERSION} -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/diablo-jdk13 +.else +JDK13DIR= ${LOCALBASE}/jbootstrap +BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/jbootstrap .endif .endif |