From 35dbc5bb82f2e0227c6080e39c2ea832df4eadec Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 3 May 2002 05:36:11 +0000 Subject: Add a NATIVE_BOOTSTRAP knob which allows people to bootstrap with an already installed native JDK rather than insisting on the hardcoded Sun Linux JDK as the bootstrapper. This also means that one can remove the Sun Linux JDK after the initial build if so desired. This may be superseded by a more general method of specifying the bootstrap compiler from bsd.java.mk at a later date. Reviewed by: sobomax Approved by: sobomax --- java/jdk13/Makefile | 4 ++++ java/jdk14/Makefile | 4 ++++ java/jdk15/Makefile | 4 ++++ java/jdk16/Makefile | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index e4b5c43a114f..2eebfab76289 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -35,7 +35,11 @@ WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 JDK_PATCHSET_VERSION= 6 +.if defined(NATIVE_BOOTSTRAP) +JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} +.else JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +.endif ONLY_FOR_ARCHS= i386 USE_GMAKE= yes diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index e4b5c43a114f..2eebfab76289 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -35,7 +35,11 @@ WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 JDK_PATCHSET_VERSION= 6 +.if defined(NATIVE_BOOTSTRAP) +JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} +.else JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +.endif ONLY_FOR_ARCHS= i386 USE_GMAKE= yes diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index e4b5c43a114f..2eebfab76289 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -35,7 +35,11 @@ WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 JDK_PATCHSET_VERSION= 6 +.if defined(NATIVE_BOOTSTRAP) +JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} +.else JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +.endif ONLY_FOR_ARCHS= i386 USE_GMAKE= yes diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index e4b5c43a114f..2eebfab76289 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -35,7 +35,11 @@ WRKSRC= ${WRKDIR}/j2sdk1.3.1/make JDK_VERSION= 1.3.1 JDK_PATCHSET_VERSION= 6 +.if defined(NATIVE_BOOTSTRAP) +JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} +.else JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +.endif ONLY_FOR_ARCHS= i386 USE_GMAKE= yes -- cgit v1.2.3