From kde-commits  Sun Jul 08 15:24:22 2012
From: =?utf-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak () kde ! org>
Date: Sun, 08 Jul 2012 15:24:22 +0000
To: kde-commits
Subject: icecream
Message-Id: <20120708152422.ACD48AC7A9 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=134176130117303

SVN commit 1304628 by lunakl:

clang and clang++ are the same binary

So it's not necessary to add it twice to the tarball, and remote
nodes always pass -x c or -x c++ .



 M  +18 -25    client/icecc-create-env  
 M  +2 -2      services/comm.cpp  


--- trunk/icecream/client/icecc-create-env #1304627:1304628
@@ -14,7 +14,7 @@
 usage ()
 {
     echo "usage: $0 <gcc_path> <g++_path>"
-    echo "usage: $0 [<gcc_path>|] [<g++_path>|] <clang_path> <clang++_path>"
+    echo "usage: $0 [<gcc_path>|] [<g++_path>|] <clang_path>"
 }
 
 is_contained ()
@@ -77,24 +77,6 @@
   fi
 }
 
-check_compiler ()
-{
-    added_cc=$1
-    added_cxx=$2
-    if test -z "$added_cc" || test -z "$added_cxx"; then
-	usage
-	exit 1
-    fi
-    if ! test -x "$added_cc" ; then
-        echo "'$added_cc' is no executable."
-        exit 1
-    fi
-    if ! test -x "$added_cxx" ; then
-        echo "'$added_cxx' is no executable."
-        exit 1
-    fi
-}
-
 # backward compat
 if test "$1" = "--respect-path"; then
   shift
@@ -107,18 +89,30 @@
 
 if test -n "$added_gcc" || test -n "$added_gxx"; then
     gcc=1
-    check_compiler "$added_gcc" "$added_gxx"
+    if test -z "$added_gcc" || test -z "$added_gxx"; then
+        usage
+        exit 1
 fi
+    if ! test -x "$added_gcc" ; then
+        echo "'$added_gcc' is no executable."
+        exit 1
+    fi
+    if ! test -x "$added_gxx" ; then
+        echo "'$added_gxx' is no executable."
+        exit 1
+    fi
+fi
 	
 added_clang=$1
 shift
-added_clangxx=$1
-shift
 
-if test -n "$added_clang" || test -n "$added_clangxx"; then
+if test -n "$added_clang"; then
     clang=1
-    check_compiler "$added_clang" "$added_clangxx"
+    if ! test -x "$added_clang" ; then
+        echo "'$added_clang' is no executable."
+        exit 1
 fi
+fi
 	
 if test -z "$gcc" && test -z "$clang"; then
     usage
@@ -150,7 +144,6 @@
 
 if test -n "$clang"; then
     add_file $added_clang /usr/bin/clang
-    add_file $added_clangxx /usr/bin/clang++
     # clang requires /tmp
     mkdir "$tempdir"/tmp/
     chmod 1777 "$tempdir"/tmp/
--- trunk/icecream/services/comm.cpp #1304627:1304628
@@ -1363,11 +1363,11 @@
 // Environments created by icecc-create-env always use the same binary name
 // for compilers, so even if local name was e.g. c++, remote needs to
 // be g++ (before protocol version 30 remote CS even had /usr/bin/{gcc|g++}
-// hardcoded).
+// hardcoded).  For clang, the binary is just clang for both C/C++.
 string CompileFileMsg::remote_compiler_name() const
 {
     if (job->compilerName().find("clang") != string::npos)
-        return job->language() == CompileJob::Lang_CXX ? "clang++" : "clang";
+        return "clang";
     return job->language() == CompileJob::Lang_CXX ? "g++" : "gcc";
 }