summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner>2003-06-06 19:33:12 +0000
committerdrochner <drochner>2003-06-06 19:33:12 +0000
commita72dd71597f3b554d7281bcb53f13ca90c359453 (patch)
tree84c00a851b9e15d337ef73090ac282fe365b3fe5
parent84daf19ee7577a04beaf154d06fbc275b29dc155 (diff)
downloadpkgsrc-a72dd71597f3b554d7281bcb53f13ca90c359453.tar.gz
replace ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} by just
${LINK_ALL_LIBGCC_HACK}
-rw-r--r--www/apache/Makefile4
-rw-r--r--www/apache6/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index b4f4b9bd5fa..ba531b6c39b 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2003/05/31 15:03:17 grant Exp $
+# $NetBSD: Makefile,v 1.130 2003/06/06 19:33:12 drochner Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -107,7 +107,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
#
.if ${OPSYS} == "NetBSD"
. if ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG}
+LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK}
MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
# if we are using gcc3, we need to link against libgcc_s, too. This
# ensures modules can resolve symbols they require from gcc.
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 4ab22e161f1..a418754c102 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2003/06/02 01:16:08 jschauma Exp $
+# $NetBSD: Makefile,v 1.76 2003/06/06 19:33:12 drochner Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -110,7 +110,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
#
.if ${OPSYS} == "NetBSD"
. if ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG}
+LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK}
MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
# if we are using gcc3, we need to link against libgcc_s, too. This
# ensures modules can resolve symbols they require from gcc.