From ada56b5a0bd658f22d44082b7161f523a0c6d4d3 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Fri, 12 Sep 2003 15:54:40 +0000
Subject: tidy up handling of LDFLAGS wrt USE_GCC_SHLIB a little.

---
 lang/gcc/buildlink2.mk  | 8 +-------
 lang/gcc3/buildlink2.mk | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk
index 461642f9bac..0c75b3cb4d2 100644
--- a/lang/gcc/buildlink2.mk
+++ b/lang/gcc/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2003/09/12 13:03:40 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2003/09/12 15:54:43 grant Exp $
 
 # Do not directly include this file in package Makefiles. It is
 # automatically included when required based on USE_GCC2.
@@ -19,16 +19,10 @@ BUILDLINK_DEPMETHOD.gcc?=	build
 .endif
 
 BUILDLINK_PREFIX.gcc=	${LOCALBASE}
-
 _GCC_PREFIX=		${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}
 
-BUILDLINK_LDFLAGS.gcc=	-L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib
-
 BUILDLINK_PACKAGES+=	gcc
 
-.if defined(USE_GCC_SHLIB)
-LDFLAGS+=		${BUILDLINK_LDFLAGS.gcc}
-.endif
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk
index b336ec76abe..54579874f36 100644
--- a/lang/gcc3/buildlink2.mk
+++ b/lang/gcc3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/09/12 15:28:54 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/09/12 15:54:44 grant Exp $
 
 # Do not directly include this file in package Makefiles. It is
 # automatically included when required based on USE_GCC3.
@@ -19,7 +19,6 @@ BUILDLINK_DEPMETHOD.gcc?=	build
 .endif
 
 BUILDLINK_PREFIX.gcc=	${LOCALBASE}
-
 _GCC_PREFIX=		${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}
 _GCC_LIBGCCDIR!=						\
   if [ -x ${_GCC_PREFIX}bin/gcc ]; then				\
@@ -30,13 +29,8 @@ _GCC_LIBGCCDIR!=						\
 _GCC_ARCHSUBDIR= \
   ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}||}
 
-BUILDLINK_LDFLAGS.gcc=	-L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib
-
 BUILDLINK_PACKAGES+=	gcc
 
-.if defined(USE_GCC_SHLIB)
-LDFLAGS+=		${BUILDLINK_LDFLAGS.gcc}
-.endif
 BUILDLINK_WRAPPER_ENV+=	\
 	COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-- 
cgit v1.2.3