summaryrefslogtreecommitdiff
path: root/lang/gcc
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-05-29 23:14:07 +0000
committergrant <grant@pkgsrc.org>2003-05-29 23:14:07 +0000
commit712c21283a3273130919635485aa657bfcf2df4a (patch)
tree2ab39a00d70ddd1fe87ded8ec8941560f6ff8dee /lang/gcc
parent392ba6fb3d2d351009bec6eaba0af88df7641d33 (diff)
downloadpkgsrc-712c21283a3273130919635485aa657bfcf2df4a.tar.gz
s/USE_CXX/USE_GCC_SHLIB/ - there are more shared libraries than just
libstdc++ in gcc3. when defined, USE_GCC_SHLIB ensures that the correct rpath is passed to the linker, and a full dependency on the compiler package is registered. packages which define USE_GCC_SHLIB should not include mk/gcc.buildlink2.mk (or gcc{,3}/buildlink2.mk) as it is handled automatically.
Diffstat (limited to 'lang/gcc')
-rw-r--r--lang/gcc/buildlink2.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk
index 5021a750473..68d4b1c0dd3 100644
--- a/lang/gcc/buildlink2.mk
+++ b/lang/gcc/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/05/28 13:24:36 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/05/29 23:14:12 grant Exp $
.if !defined(GCC2_BUILDLINK2_MK)
GCC2_BUILDLINK2_MK= # defined
@@ -12,10 +12,10 @@ GCC_REQD?= 2.95.3
BUILDLINK_DEPENDS.gcc?= gcc>=${GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc
-# Packages that use the C++ compiler and subsequently link against the
-# shared libstdc++ from the package need a full dependency.
+# Packages that link against shared gcc libraries need a full
+# dependency.
#
-.if defined(USE_CXX)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc+= full
.else
BUILDLINK_DEPMETHOD.gcc?= build
@@ -69,7 +69,7 @@ CXX= ${_GCC_PREFIX}bin/g++
F77= ${_GCC_PREFIX}bin/g77
PKG_FC= ${F77}
-. if defined(USE_CXX)
+. if defined(USE_GCC_SHLIB)
LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc}
. endif
BUILDLINK_WRAPPER_ENV+= \