summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/compiler.mk5
-rw-r--r--mk/defaults/mk.conf7
2 files changed, 7 insertions, 5 deletions
diff --git a/mk/compiler.mk b/mk/compiler.mk
index 08854fae6bf..a3dcc817671 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.43 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: compiler.mk,v 1.44 2005/01/24 18:07:56 tv Exp $
#
# This Makefile fragment implements handling for supported C/C++/Fortran
# compilers.
@@ -74,9 +74,6 @@ USE_LANGUAGES?= c
USE_LANGUAGES:= c ${USE_LANGUAGES}
.endif
-# Default to using gcc.
-PKGSRC_COMPILER?= gcc
-
# For environments where there is an external gcc too, but pkgsrc
# should use the pkgsrc one for consistency.
#
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 2dd70c371a6..79ed361c8fb 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.23 2005/01/12 12:54:45 jmmv Exp $
+# $NetBSD: mk.conf,v 1.24 2005/01/24 18:07:56 tv Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -107,6 +107,11 @@ IGNORE_RECOMMENDED?= no
# Possible: YES, NO
# Default: YES
+PKGSRC_COMPILER?= gcc
+# Compiler type(s) to use for building packages
+# Possible: (see comments in mk/compiler.mk)
+# Default: "gcc"
+
PKGSRC_MESSAGE_RECIPIENTS?=
# login names of recipients of any MESSAGE files which will be mailed
# Possible: any login names