summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-09-14 01:36:29 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-09-14 01:36:29 +0800
commit2b8de5506509aa4b26bb7e2a4c557659ac86659b (patch)
tree69f957931e86b472f12955a1827a3b34147c3709 /java
parent0597ac0c1c790e756f596c4589288b8c292fcc13 (diff)
downloadmarcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar.gz
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar.bz2
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar.lz
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar.xz
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.tar.zst
marcuscom-ports-2b8de5506509aa4b26bb7e2a4c557659ac86659b.zip
- Sync with ports
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7295 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'java')
-rw-r--r--java/jdk15/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 2aafda30f..6fed8d386 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -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