From owner-svn-src-stable-10@FreeBSD.ORG  Tue Oct 29 11:36:32 2013
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 47D878BB;
 Tue, 29 Oct 2013 11:36:32 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 322B52E51;
 Tue, 29 Oct 2013 11:36:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TBaWXG037292;
 Tue, 29 Oct 2013 11:36:32 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TBaWHa037291;
 Tue, 29 Oct 2013 11:36:32 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201310291136.r9TBaWHa037291@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Tue, 29 Oct 2013 11:36:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257327 - stable/10/contrib/llvm/tools/clang/tools/driver
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 11:36:32 -0000

Author: smh
Date: Tue Oct 29 11:36:31 2013
New Revision: 257327
URL: http://svnweb.freebsd.org/changeset/base/257327

Log:
  MFC r257109:
  Add clang-CC and CC to list of hints allowing clang to identify its operating
  mode as c++ instead of defaulting to c for the binary names CC and clang-CC.
  
  This fixes builds that use cmake which automatically sets CXX to
  /usr/bin/CC by default.
  
  PR:		bin/182442
  Approved by:	re (glebius)

Modified:
  stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp
Directory Properties:
  stable/10/contrib/llvm/tools/clang/   (props changed)

Modified: stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp
==============================================================================
--- stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp	Tue Oct 29 11:28:11 2013	(r257326)
+++ stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp	Tue Oct 29 11:36:31 2013	(r257327)
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImp
   } suffixes [] = {
     { "clang", false, false },
     { "clang++", true, false },
+    { "clang-CC", true, false },
     { "clang-c++", true, false },
     { "clang-cc", false, false },
     { "clang-cpp", false, true },
     { "clang-g++", true, false },
     { "clang-gcc", false, false },
+    { "CC", true, false },
     { "cc", false, false },
     { "cpp", false, true },
     { "++", true, false },