From d90d4fa943f24603777a606c733359e628bb862b Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 13 Jul 2003 13:10:43 +0000
Subject: don't set USE_GCC2 by default as it implies the use pkgsrc gcc2, and
 move handling of gcc shared libraries to bsd.prefs.mk.

---
 mk/bsd.pkg.mk   |  8 +-------
 mk/bsd.prefs.mk | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8c2e2f2d6f4..6e68498d2d6 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1214 2003/07/13 06:44:02 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1215 2003/07/13 13:10:43 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -219,12 +219,6 @@ MAKE_ENV+=	F77="${F77}"
 MAKE_ENV+=	FC="${FC}"
 .endif
 
-# Ensure the correct rpath is passed to the linker to enable packages
-# to find shared libraries from gcc.
-.if defined(USE_GCC_SHLIB)
-.  include "../../mk/gcc.buildlink2.mk"
-.endif
-
 # Automatically increase process limit where necessary for building.
 _ULIMIT_CMD=
 .if defined(UNLIMIT_RESOURCES)
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index e43c1422aaa..581a2286a30 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.116 2003/07/09 16:07:21 salo Exp $
+# $NetBSD: bsd.prefs.mk,v 1.117 2003/07/13 13:10:43 grant Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -335,7 +335,17 @@ WRKDIR_BASENAME?=	work
 
 WRKDIR?=		${BUILD_DIR}/${WRKDIR_BASENAME}
 
-# Set the default compiler to GCC 2.x if different compiler is not selected.
+# Sun C++ compilers don't support passing ld flags with -Wl to CC.
+#
+.if defined(USE_SUNPRO)
+_COMPILER_LD_FLAG=		# pattern for Sun compilers
+.else
+_COMPILER_LD_FLAG=	-Wl,	# pattern for GCC and others
+.endif
+
+# Ensure the correct rpath is passed to the linker to enable packages
+# to find shared libraries from gcc. Has no effect when pkgsrc gcc is
+# not being used.
 #
 # Valid compilers are:
 #
@@ -345,16 +355,6 @@ WRKDIR?=		${BUILD_DIR}/${WRKDIR_BASENAME}
 #	USE_SUNPRO  - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio
 #	              Compiler Collection
 #
-.if !defined(USE_GCC3) && !defined(USE_MIPSPRO) && !defined(USE_SUNPRO)
-USE_GCC2=		YES
-.endif
-
-# Sun C++ compilers don't support passing ld flags with -Wl to CC.
-#
-.if defined(USE_SUNPRO)
-_COMPILER_LD_FLAG=		# pattern for Sun compilers
-.else
-_COMPILER_LD_FLAG=	-Wl,	# pattern for GCC and others
-.endif
+.include "../../mk/gcc.buildlink2.mk"
 
 .endif	# BSD_PKG_MK
-- 
cgit v1.2.3