. Diablo is no longer restricted to i386, so allow it to be a possible

native bootstrap JDK on all (supported) architectures.

  This is a slightly different change than the submitters.

PR:		103227
Submitted by:	Pat Lashley <patl+freebsd@volant.org>
This commit is contained in:
Greg Lewis 2006-09-13 16:44:38 +00:00
parent f56132fe63
commit 92035cfdf1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=172952
2 changed files with 4 additions and 8 deletions

View file

@ -57,10 +57,8 @@ LATEST_LINK= jdk15
SUN_LINUX_JDK_VERSION= 1.4.2
.if !defined(WITH_LINUX_BOOTSTRAP)
.if ${MACHINE_ARCH} == "i386"
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0
.endif
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/jdk1.5.0 \
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0 \
${LOCALBASE}/jdk1.5.0 \
${LOCALBASE}/jdk1.4.2
.endif

View file

@ -57,10 +57,8 @@ LATEST_LINK= jdk15
SUN_LINUX_JDK_VERSION= 1.4.2
.if !defined(WITH_LINUX_BOOTSTRAP)
.if ${MACHINE_ARCH} == "i386"
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0
.endif
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/jdk1.5.0 \
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0 \
${LOCALBASE}/jdk1.5.0 \
${LOCALBASE}/jdk1.4.2
.endif