diff options
| author | grant <grant> | 2003-05-31 15:03:17 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-05-31 15:03:17 +0000 |
| commit | a56c5ef7fb55a71ac53c8de247e6c7f5bcbee9b7 (patch) | |
| tree | 1f8a3971c64034c42a01eda4c31c5319f8788433 /www | |
| parent | 59809db6de767b6afd04f93a65b482be156c47f2 (diff) | |
| download | pkgsrc-a56c5ef7fb55a71ac53c8de247e6c7f5bcbee9b7.tar.gz | |
tidy up logic for adding libgcc and libgcc_s. no functional change.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 14 | ||||
| -rw-r--r-- | www/apache6/Makefile | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 5f05645850a..b4f4b9bd5fa 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2003/05/31 13:32:49 grant Exp $ +# $NetBSD: Makefile,v 1.129 2003/05/31 15:03:17 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). @@ -105,19 +105,19 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. # -.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" +.if ${OPSYS} == "NetBSD" +. if ${OBJECT_FMT} == "ELF" LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} -.endif - +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. -.if defined(USE_GCC3) +. if defined(USE_GCC3) USE_GCC_SHLIB= # defined LINK_LIBGCC_LDFLAGS+= -lgcc_s +. endif +. endif .endif -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" - # Use operating system's db1 functions (where available) USE_DB185= # defined diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 110efdf9a6c..cc29c84a198 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2003/05/31 13:32:49 grant Exp $ +# $NetBSD: Makefile,v 1.74 2003/05/31 15:03:18 grant Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -108,19 +108,19 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. # -.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" +.if ${OPSYS} == "NetBSD" +. if ${OBJECT_FMT} == "ELF" LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} -.endif - +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. -.if defined(USE_GCC3) +. if defined(USE_GCC3) USE_GCC_SHLIB= # defined LINK_LIBGCC_LDFLAGS+= -lgcc_s +. endif +. endif .endif -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" - # Use operating system's db1 functions (where available) .include "../../databases/db/buildlink2.mk" BUILDLINK_DEPENDS.db= db>=2.7.7 |