From f3c7cc76d96b1da124d554fc1230b471ebbdeeeb Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr>
Date: Sun, 1 Aug 2004 10:14:16 +0000
Subject: Check the version of as using the just-computed ${AS_PATH}, not
 ${AS}, following the change to gcc3/Makefile.common submitted by
 jlam@netbsd.org

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

(limited to 'lang/gcc34')

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 4a5eb87ff81..4f6accdbd18 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/07/28 21:30:19 shannonjr Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/01 10:14:16 shannonjr Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -30,7 +30,7 @@ AS_PATH:=	${_dir_}/${AS}
 .    if !empty(AS_PATH:M${LOCALBASE}/*)
 USE_BINUTILS=	YES
 .    else
-AS_VERSION!=	${AS} --version | ${AWK} '{				\
+AS_VERSION!=	${AS_PATH} --version | ${AWK} '{			\
 		    split($$3, v, /[.]/);				\
 		    printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4];	\
 		    exit;						\
@@ -43,6 +43,7 @@ MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
 .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
 DEPENDS+=	binutils>=2.14:../../devel/binutils
 CONFIGURE_ARGS+=	--with-as=${LOCALBASE}/bin/as
+CONFIGURE_ARGS+=	--with-ld=${LOCALBASE}/bin/ld
 CONFIGURE_ARGS+=	--with-gnu-as
 CONFIGURE_ARGS+=	--with-gnu-ld
 .endif
-- 
cgit v1.2.3