summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2013-10-29 11:36:31 +0000
committersmh <smh@FreeBSD.org>2013-10-29 11:36:31 +0000
commit7fcf8773f447dccc87ae37d4b3792e7343167707 (patch)
treeb3df67925a1329c75942c15a307b63d074506f58
parent60686beab7f4e76f853787cd393f360109ef72ca (diff)
downloadFreeBSD-src-7fcf8773f447dccc87ae37d4b3792e7343167707.zip
FreeBSD-src-7fcf8773f447dccc87ae37d4b3792e7343167707.tar.gz
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)
-rw-r--r--contrib/llvm/tools/clang/tools/driver/driver.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/tools/driver/driver.cpp b/contrib/llvm/tools/clang/tools/driver/driver.cpp
index 4c40da3..ef8572f 100644
--- a/contrib/llvm/tools/clang/tools/driver/driver.cpp
+++ b/contrib/llvm/tools/clang/tools/driver/driver.cpp
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImpl<const char *> &ArgVector,
} 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 },
OpenPOWER on IntegriCloud