summaryrefslogtreecommitdiff
path: root/mk/compiler.mk
diff options
context:
space:
mode:
authorwiz <wiz>2004-07-04 00:28:30 +0000
committerwiz <wiz>2004-07-04 00:28:30 +0000
commitdef9259dc4a7a2539d0b703313c3baba8783d614 (patch)
tree8d1a684cd94b7a1537207ff1e633c6e7286fe80a /mk/compiler.mk
parentaa5c712aaf33ef6d8c32ef7d2a582143f0276434 (diff)
downloadpkgsrc-def9259dc4a7a2539d0b703313c3baba8783d614.tar.gz
Retire USE_GCC2, USE_GCC3, USE_SUNPRO, USE_MIPSPRO, and USE_PKGSRC_GCC,
now that all instances of packages using it have been fixed.
Diffstat (limited to 'mk/compiler.mk')
-rw-r--r--mk/compiler.mk24
1 files changed, 2 insertions, 22 deletions
diff --git a/mk/compiler.mk b/mk/compiler.mk
index 5fd429651da..e975facffe0 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.32 2004/05/12 21:49:39 reed Exp $
+# $NetBSD: compiler.mk,v 1.33 2004/07/04 00:28:30 wiz Exp $
#
# This Makefile fragment implements handling for supported C/C++/Fortran
# compilers.
@@ -59,9 +59,6 @@
# ...
# .endif
#
-# The following variables are deprecated:
-#
-# USE_GCC2, USE_GCC3, USE_SUNPRO, USE_MIPSPRO
.if !defined(BSD_COMPILER_MK)
BSD_COMPILER_MK= defined
@@ -81,25 +78,8 @@ USE_LANGUAGES?= c c++
# By default, assume that the package requires a C compiler.
USE_LANGUAGES?= c
-# Support some deprecated variables for a while. They'll be removed
-# after the pkgsrc-2004Q2 branch is cut.
-#
-.if defined(USE_GCC2)
-GCC_REQD+= 2.8.0
-PKGSRC_COMPILER?= gcc
-.elif defined(USE_GCC3)
-GCC_REQD+= 3.0
-PKGSRC_COMPILER?= gcc
-.elif defined(USE_PKGSRC_GCC)
-_USE_PKGSRC_GCC= yes
+# Default to using gcc.
PKGSRC_COMPILER?= gcc
-.elif defined(USE_SUNPRO)
-PKGSRC_COMPILER?= sunpro
-.elif defined(USE_MIPSPRO)
-PKGSRC_COMPILER?= mipspro
-.else
-PKGSRC_COMPILER?= gcc
-.endif
_COMPILERS= gcc mipspro mipspro-ucode sunpro
_PSEUDO_COMPILERS= ccache distcc