From 5d84a580d85247021e74ad952376a4aa9b72471a Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Tue, 25 Apr 2006 20:44:28 +0000 Subject: . Make diablo-jdk15 the default bootstrap JDK for i386. Suggested by: "Nikolas Britton" --- java/jdk15/Makefile | 5 ++++- java/jdk16/Makefile | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'java') 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 diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 8bda0fa7beb8..05cd70f27fc0 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/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 -- cgit v1.2.3