From 9ef0861f79f8101f128e166b8cd2fcbe3fa7f08e Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Sun, 7 Sep 2008 05:12:58 +0000
Subject: Refine previous slightly; it can now actually configure libjava
 library, and it might build for i386, although x86_64 is still pretty broken.

---
 lang/gcc3-java/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index cf663f3e5e0..54325ba13e2 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/09/07 03:23:16 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2008/09/07 05:12:58 dholland Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
 COMMENT=	GNU Compiler Collection, v3 - Java compiler
@@ -31,8 +31,9 @@ REPLACE_FILES.awk+=	libjava/addr2name.awk
 do-build:
 	cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} java
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		GCC_FOR_TARGET=gcc \
 		${GMAKE} configure-target-libjava
-	[ -f ${WRKSRC}/libjava/Makefile ] || ${FALSE}
+	[ -f ${WRKSRC}/${GCC_PLATFORM}/libjava/Makefile ] || ${FALSE}
 	${ULIMIT_CMD_datasize}; cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${GMAKE} all-target-libjava
 
-- 
cgit v1.2.3