summaryrefslogtreecommitdiff
path: root/java/jdk15
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2006-04-25 20:44:28 +0000
committerGreg Lewis <glewis@FreeBSD.org>2006-04-25 20:44:28 +0000
commit5d84a580d85247021e74ad952376a4aa9b72471a (patch)
tree32a44bedd60dda4a6b9bf5c0c34f129590419e2c /java/jdk15
parent- Update the ruby on rails suite to 1.1.2 (diff)
. Make diablo-jdk15 the default bootstrap JDK for i386.
Suggested by: "Nikolas Britton" <nikolas.britton@gmail.com>
Diffstat (limited to 'java/jdk15')
-rw-r--r--java/jdk15/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 8bda0fa7beb8..05cd70f27fc0 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -62,7 +62,10 @@ LATEST_LINK= jdk15
SUN_LINUX_JDK_VERSION= 1.4.2
.if !defined(WITH_LINUX_BOOTSTRAP)
-NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.5.0 \
+.if ${MACHINE_ARCH} == "i386"
+NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0
+.endif
+NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/jdk1.5.0 \
${LOCALBASE}/jdk1.4.2
.endif