@@ -1,10 +1,38 @@
-# $NetBSD: gcc.mk,v 1.93 2008/02/07 20:59:05 rillig Exp $
+# $NetBSD: gcc.mk,v 1.94 2008/09/16 15:02:55 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
+
+_VARGROUPS+=	gcc
+_USER_VARS.gcc=	USE_NATIVE_GCC
+_PKG_VARS.gcc=	GCC_REQD
+_SYS_VARS.gcc=	CC_VERSION CC_VERSION_STRING LANGUAGES.gcc
+_DEF_VARS.gcc=	\
+	CCPATH CPPPATH CXXPATH \
+	F77PATH FCPATH \
+	GCC_USE_SYMLINKS \
+	IMAKEOPTS \
+	LDFLAGS \
+	PKG_CC PKG_CPP PKG_CXX PKG_FC \
+	_CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
+	_GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CC \
+	_GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
+	_GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
+	_GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
+	_GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
+	_GCC_TEST_DEPENDS _GCC_USE_F2C _GCC_VARS _GCC_VERSION \
+	_GCC_VERSION_STRING \
+	_IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \
+	_IS_BUILTIN_GCC \
+	_LANGUAGES.gcc \
+	_LINKER_RPATH_FLAG \
+	_NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_NEWER_GCC \
+	_PKGSRC_GCC_VERSION \
+	_USE_GCC_SHLIB _USE_PKGSRC_GCC \
+	_WRAP_EXTRA_ARGS.CC
 
 .include "../../mk/bsd.prefs.mk"