summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2017-01-28 22:59:53 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2017-01-28 22:59:53 +0000
commit0992d93e8d0c03dc24a69d9358ab0dca468eebd8 (patch)
tree4df3102cc4a039713b1167509c5216690ecb7fee
parentUpdate to 1.6.2 (diff)
Remove 4.6 as a valid option for USE_GCC and GCC_DEFAULT; it has not
been used in the Ports Collection for quarters and hardly would make sense (or even work) as default GCC version.
-rw-r--r--Mk/bsd.default-versions.mk2
-rw-r--r--Mk/bsd.gcc.mk3
2 files changed, 2 insertions, 3 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 03fdeb8d932a..dc952cb9b393 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -37,7 +37,7 @@ BDB_DEFAULT?= 5
FIREBIRD_DEFAULT?= 2.5
# Possible values: 3.0.0
FPC_DEFAULT?= 3.0.0
-# Possible values: 4.6, 4.7, 4.8, 4.9, 5, 6
+# Possible values: 4.7, 4.8, 4.9, 5, 6
GCC_DEFAULT?= 4.9
# Possible values: 7, 8, 9, agpl
GHOSTSCRIPT_DEFAULT?= agpl
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index e6a60556e608..28c3a4ee1ed9 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -35,12 +35,11 @@ GCC_Include_MAINTAINER= gerald@FreeBSD.org
# ascending order and in sync with the table below.
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-GCCVERSIONS= 040200 040600 040700 040800 040900 050000 060000
+GCCVERSIONS= 040200 040700 040800 040900 050000 060000
# The first field is the OSVERSION in which it disappeared from the base.
# The second field is the version as USE_GCC would use.
GCCVERSION_040200= 9999999 4.2
-GCCVERSION_040600= 0 4.6
GCCVERSION_040700= 0 4.7
GCCVERSION_040800= 0 4.8
GCCVERSION_040900= 0 4.9