From d89cda310fac18bac18edce42fa346ac8f9c3e20 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 12 Oct 2012 10:57:12 +0200
Subject: [PATCH] customcc/compilers.conf: Some adjustments and
 simplifications.

* pkgsrc's clang no longer needs special handling for C++ compilation.

* Use gcc44's cpp, gcc41 is gone.

* -dumpversion is now understool by both pkgsrc's and SVN trunk's
  clang, so no special handling needed for that either.

Based on an older patch I did with Juan Francisco a year ago.

Reported-by:   Juan Francisco Cantero Hurtado <iam@juanfra.info>
               Joris Giovannangeli <joris@giovannangeli.fr>
Tested-by:     Joris Giovannangeli <joris@giovannangeli.fr>
Dragonfly-bug: <http://bugs.dragonflybsd.org/issues/2205>
---
 etc/defaults/compilers.conf |  4 ++--
 libexec/customcc/cc.sh      | 31 +++----------------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/etc/defaults/compilers.conf b/etc/defaults/compilers.conf
index 3630d043b2..6cf1711e8a 100644
--- a/etc/defaults/compilers.conf
+++ b/etc/defaults/compilers.conf
@@ -4,13 +4,13 @@ clangsvn_CC=/usr/local/bin/clang
 clangsvn_CXX=/usr/local/bin/clang++
 clangsvn_CFLAGS="-fno-color-diagnostics -Qunused-arguments -std=gnu89"
 clangsvn_CXXFLAGS="-fno-color-diagnostics -Qunused-arguments -std=gnu++98"
-clangsvn_VERSION=4.1.2
 
 # clang from pkgsrc
 #
 clang_CC=/usr/pkg/bin/clang
+clang_CXX=/usr/pkg/bin/clang++
 clang_CFLAGS="-fno-color-diagnostics -Qunused-arguments -std=gnu89"
-clang_VERSION=4.1.2
+clang_CXXFLAGS="-fno-color-diagnostics -Qunused-arguments -std=gnu++98"
 
 # gnat-aux (i.e. gcc 4.6) from pkgsrc
 #
diff --git a/libexec/customcc/cc.sh b/libexec/customcc/cc.sh
index b3a2024715..428a042642 100644
--- a/libexec/customcc/cc.sh
+++ b/libexec/customcc/cc.sh
@@ -34,31 +34,9 @@
 CDIR=$(dirname $0)
 CNAME=$(basename $0)
 
-# XXX clang needs some special handling
-#
-# it is called only for "cc" and "gcc" and even then it could have been
-# run on c++ files
-#
-if [ "${CCVER}" = "clang" ]; then
-	if [ "${CNAME}" = "cpp" ]; then
-		exec ${CDIR}/../gcc41/cpp "$@"
-	elif [ "${CNAME}" = "c++" -o "${CNAME}" = "g++" ]; then
-		exec ${CDIR}/../gcc41/c++ "$@"
-	elif [ -z $beenhere ]; then
-		export beenhere=1
-		oldargs="$@"
-		export oldargs
-		INCOPT="-nobuiltininc -nostdinc \
-		    -isysroot @@INCPREFIX@@ \
-		    -isystem /usr/include \
-		    -isystem /usr/libdata/gcc41 \
-		    -isystem /usr/include/c++/4.1"
-	elif [ "${CNAME}" = "cc" -o "${CNAME}" = "gcc" ]; then
-		exec ${CDIR}/../gcc41/cc $oldargs
-	fi
-elif [ "${CCVER}" = "clangsvn" ]; then
+if [ "${CCVER}" = "clang" -o "${CCVER}" = "clangsvn" ]; then
 	if [ "${CNAME}" = "cpp" ]; then
-		exec ${CDIR}/../gcc41/cpp "$@"
+		exec ${CDIR}/../gcc44/cpp "$@"
 	else
 		INCOPT="-nobuiltininc -nostdinc \
 		    -isysroot @@INCPREFIX@@ \
@@ -84,11 +62,8 @@ CUSTOM_CXX=`eval echo \$\{${CCVER}_CXX\}`
 CUSTOM_CXXFLAGS=`eval echo \$\{${CCVER}_CXXFLAGS\}`
 CUSTOM_CPP=`eval echo \$\{${CCVER}_CPP\}`
 CUSTOM_CPPFLAGS=`eval echo \$\{${CCVER}_CPPFLAGS\}`
-CUSTOM_VERSION=`eval echo \$\{${CCVER}_VERSION\}`
 
-if [ "${CUSTOM_VERSION}" != "" -a "$1" = "-dumpversion" ]; then
-	echo ${CUSTOM_VERSION}
-elif [ "${CNAME}" = "cc" -o "${CNAME}" = "gcc" ]; then
+if [ "${CNAME}" = "cc" -o "${CNAME}" = "gcc" ]; then
 	exec ${CUSTOM_CC} ${INCOPT} ${CUSTOM_CFLAGS} "$@"
 elif [ "${CNAME}" = "c++" -o "${CNAME}" = "g++" ]; then
 	exec ${CUSTOM_CXX} ${INCOPT} ${CUSTOM_CXXFLAGS} "$@"
-- 
2.41.0