summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorgrant <grant>2003-05-31 13:32:49 +0000
committergrant <grant>2003-05-31 13:32:49 +0000
commit22a871d43b2a26256796b2dff2a6e1532c701c45 (patch)
treea5bf23aed3c2ab8e55b84a4df589efbed33a18bd /www
parent6849a63c26aa8507a181f4fcb9d020b3f8f76ae3 (diff)
downloadpkgsrc-22a871d43b2a26256796b2dff2a6e1532c701c45.tar.gz
for consistency, use WHOLE_ARCHIVE_FLAG instead of
-Wl,--whole-archive.
Diffstat (limited to 'www')
-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 1952f3edcd2..5f05645850a 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2003/05/31 13:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.128 2003/05/31 13:32:49 grant 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).
@@ -106,7 +106,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
# referenced by DSOs written in C++ will resolve correctly.
#
.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG}
.endif
# if we are using gcc3, we need to link against libgcc_s, too. This
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index c537a8839fd..110efdf9a6c 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2003/05/31 13:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.73 2003/05/31 13:32:49 grant Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -109,7 +109,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
# referenced by DSOs written in C++ will resolve correctly.
#
.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
+LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG}
.endif
# if we are using gcc3, we need to link against libgcc_s, too. This