3 files changed, 16 insertions, 2 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 43946d8e5d7..7c8cc7fb92d 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/30 12:06:59 shannonjr Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/05 12:40:23 shannonjr Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -81,6 +81,7 @@ CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-__cxa_atexit
 CONFIGURE_ARGS+=	--enable-long-long
+CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=		ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
 
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 405b77241af..57f0ad72701 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/10/30 12:06:59 shannonjr Exp $
+$NetBSD: distinfo,v 1.12 2004/11/05 12:40:23 shannonjr Exp $
 
 SHA1 (gcc-3.4.2.tar.bz2) = 1f3fda2c8aa331ebc20bbe5020e658d4137be4fd
 Size (gcc-3.4.2.tar.bz2) = 27246826 bytes
@@ -14,3 +14,4 @@ SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c
 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
 SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386
+SHA1 (patch-cc) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12
diff --git a/lang/gcc34/patches/patch-cc b/lang/gcc34/patches/patch-cc
new file mode 100644
index 00000000000..56812e8fab5
--- /dev/null
+++ b/lang/gcc34/patches/patch-cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-cc,v 1.1 2004/11/05 12:40:23 shannonjr Exp $
+
+--- gcc/Makefile.in.orig	2004-06-17 15:56:58.000000000 -0600
++++ gcc/Makefile.in
+@@ -1390,6 +1390,7 @@ c-pch.o : c-pch.c $(CONFIG_H) $(SYSTEM_H
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+   -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \