Include "../../mk/compiler.mk" to get the value of CC_VERSION before

testing it.

4 files changed, 13 insertions, 7 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 57f11437b0b..df67509f189 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2004/02/09 19:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.138 2004/02/18 13:33:41 jlam 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).
@@ -101,6 +101,8 @@ LDFLAGS+=		${COMPILER_PERFTUNE_FLAGS}
 APACHE_CUSTOM_CFLAGS+=	-D_LARGEFILE_SOURCE
 APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64
 
+.include "../../mk/compiler.mk"
+
 # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
 # certain symbols from the C++ implementation (__get_eh_context, etc.)
 # referenced by DSOs written in C++ will resolve correctly.
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 991db11590a..f7e71fd412b 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2004/02/09 19:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2004/02/18 13:33:41 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -103,6 +103,8 @@ APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
 APACHE_CUSTOM_CFLAGS+=	-D_LARGEFILE_SOURCE
 APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64
 
+.include "../../mk/compiler.mk"
+
 # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
 # certain symbols from the C++ implementation (__get_eh_context, etc.)
 # referenced by DSOs written in C++ will resolve correctly.
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 12dcb63a711..f77454a45f2 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/02/14 17:21:54 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2004/02/18 13:33:41 jlam Exp $
 
 DISTNAME=	galeon-1.2.13
 PKGREVISION=	2
@@ -51,9 +51,7 @@ LDFLAGS+=       -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
-pre-install:
-	${GCONF_PREFIX}/bin/gconftool --shutdown
-
+.include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3*)
 # Workaround for gcc3 build issue
 post-buildlink:
@@ -62,6 +60,9 @@ post-buildlink:
 						> ${BUILDLINK_DIR}/bin/cc
 .endif
 
+pre-install:
+	${GCONF_PREFIX}/bin/gconftool --shutdown
+
 post-install:
 	${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA_PREFIX@,${MOZILLA_PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon
 	${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 52af801c175..7bcb2f42916 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.34 2004/02/18 13:33:41 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -122,6 +122,7 @@ SCRIPTS_ENV+=	SUNOSLIB=${SUNOSLIB}
 
 PTHREAD_OPTS+=	native optional
 
+.include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc*)
 COPTS?=			-O2
 .endif