From: Sascha Wildner <saw@online.de>
Date: Tue, 4 Sep 2018 06:38:59 +0000 (+0200)
Subject: More gcc80 adjustments.
X-Git-Tag: v5.5.0~235
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0cbc219347118fb18bd144b3cace9e025e6ea22d

More gcc80 adjustments.

Nothing spectacular.

Taken-from: zrj
---

diff --git a/etc/defaults/compilers.conf b/etc/defaults/compilers.conf
index 6dceb4a93d..6efb10a715 100644
--- a/etc/defaults/compilers.conf
+++ b/etc/defaults/compilers.conf
@@ -33,7 +33,7 @@
 STD_INCOPT="-nostdinc -iprefix ${INCPREFIX} -iwithprefixbefore /usr/include"
 DPORT_GCC_STD_INCOPTXX="-isystem /usr/local/lib/${CCVER}/include/c++ \
 	-isystem /usr/local/lib/${CCVER}/include/c++/${MACHARCH}-portbld-dragonfly${MACHREL}"
-DPORT_CLANG_STD_INCOPTXX="-cxx-isystem /usr/include/c++/5.0"
+DPORT_CLANG_STD_INCOPTXX="-cxx-isystem /usr/include/c++/8.0"
 
 
 # For each custom compiler definition, it is mandatory to define the
@@ -48,7 +48,7 @@ DPORT_CLANG_STD_INCOPTXX="-cxx-isystem /usr/include/c++/5.0"
 #     <CCVER>_CFLAGS     (extra CFLAGS)
 #     <CCVER>_CXXFLAGS   (extra CXXFLAGS)
 #     <CCVER>_CPPFLAGS   (extra CPPFLAGS)
-#     <CCVER>_GCOV       (path to gcov, /usr/libexec/gcc50/gcov is default)
+#     <CCVER>_GCOV       (path to gcov, /usr/libexec/gcc80/gcov is default)
 #
 # The following commands call the base compilers by default:
 #     gcc, g++, clang, clang++, clang-cpp
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index fc5f711639..7592b6af50 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -40,7 +40,7 @@
 # an experimental compiler might be broken at any time.  We currently
 # recommend that an override NOT be set in /etc/make.conf.
 #
-#CCVER?=gcc50	# (use GCC 5, default)
+#CCVER?=gcc80	# (use GCC 8, default)
 #
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings above -O (-O2, ...) are not recommended
diff --git a/gnu/usr.bin/cc80/drivers/c++/Makefile b/gnu/usr.bin/cc80/drivers/c++/Makefile
index 6f7ab47652..ae922b9198 100644
--- a/gnu/usr.bin/cc80/drivers/c++/Makefile
+++ b/gnu/usr.bin/cc80/drivers/c++/Makefile
@@ -5,7 +5,6 @@ GCC_LANG_DIR=	gcc/cp
 
 PROG_CXX=	c++
 LINKS=		${BINDIR}/c++ ${BINDIR}/g++
-# Enable this SGI compat once gcc80 becomes default (DPorts anchor)
 LINKS+=		${BINDIR}/c++ ${BINDIR}/CC
 MAN=		# man pages installed by cc (MLINK)
 
diff --git a/libexec/customcc/cc.sh b/libexec/customcc/cc.sh
index 10ccbb0a87..85076fa29d 100644
--- a/libexec/customcc/cc.sh
+++ b/libexec/customcc/cc.sh
@@ -48,7 +48,7 @@ case ${CNAME} in
 			COMPILER=${CUSTOM_GCC}
 			INCOPT=`eval echo \$\{${CCVER}_INCOPT\}`
 		else
-			COMPILER=/usr/libexec/gcc50/gcc
+			COMPILER=/usr/libexec/gcc80/gcc
 			INCOPT=${STD_INCOPT}
 		fi
 		;;
@@ -59,7 +59,7 @@ case ${CNAME} in
 			INCOPT=`eval echo \$\{${CCVER}_INCOPT\}`
 			INCOPTCXX=`eval echo \$\{${CCVER}_INCOPTCXX\}`
 		else
-			COMPILER=/usr/libexec/gcc50/g++
+			COMPILER=/usr/libexec/gcc80/g++
 			INCOPT=${GCC_INCOPT}
 			INCOPTCXX="-isystem /usr/include/c++/4.7"
 		fi
@@ -132,7 +132,7 @@ case ${CNAME} in
 		if [ -n  "${CUSTOM_GCOV}" ]; then
 			exec ${CUSTOM_GCOV} "$@"
 		else
-			exec /usr/libexec/gcc50/gcov "$@"
+			exec /usr/libexec/gcc80/gcov "$@"
 		fi
 		;;
 	*)
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index f6abc5cfae..1438916ac0 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd January 28, 2018
+.Dd September 4, 2018
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -120,7 +120,7 @@ Currently accepted values for compilers which are part of
 are
 .Dq gcc47
 and
-.Dq gcc50
+.Dq gcc80
 (default).
 All other values will handled according to the settings in
 .Xr compilers.conf 5 .
@@ -128,7 +128,7 @@ All other values will handled according to the settings in
 .Pq Vt str
 Controls which version of GCC builds the base system, including
 the kernel.
-.Dq gcc50
+.Dq gcc80
 is the default value.
 .It Va LDVER
 .Pq Vt str