diff options
author | dim <dim@FreeBSD.org> | 2016-01-12 19:33:43 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2016-01-12 19:33:43 +0000 |
commit | 8391ee29eb83e99fa1a8863bb47078102b8bc142 (patch) | |
tree | 5648dda255aac2350066d69269240fc27f733a92 | |
parent | 5d45988feff4bfc6f2869586aff94a708392c0d5 (diff) | |
download | FreeBSD-src-8391ee29eb83e99fa1a8863bb47078102b8bc142.zip FreeBSD-src-8391ee29eb83e99fa1a8863bb47078102b8bc142.tar.gz |
MFC r292950:
Drop the clang patch which adds recognition of 'CC' suffixes as aliases
for --driver-mode=g++, since this was never upstreamed. For backwards
compatibility, add a wrapper shell script.
-rw-r--r-- | contrib/llvm/patches/patch-r257109-add-CC-aliases.diff | 25 | ||||
-rw-r--r-- | contrib/llvm/tools/clang/tools/driver/driver.cpp | 2 | ||||
-rwxr-xr-x | usr.bin/clang/clang/CC.sh | 4 | ||||
-rw-r--r-- | usr.bin/clang/clang/Makefile | 4 |
4 files changed, 7 insertions, 28 deletions
diff --git a/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff b/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff deleted file mode 100644 index c5bc281..0000000 --- a/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff +++ /dev/null @@ -1,25 +0,0 @@ -This patch adds "CC" and "clang-CC" to the list of program name aliases which -invoke the C++ compiler. - -Introduced here: http://svnweb.freebsd.org/changeset/base/257109 - -Index: tools/clang/tools/driver/driver.cpp -=================================================================== ---- tools/clang/tools/driver/driver.cpp -+++ tools/clang/tools/driver/driver.cpp -@@ -215,6 +215,7 @@ static void ParseProgName(SmallVectorImpl<const ch - } suffixes [] = { - { "clang", 0 }, - { "clang++", "--driver-mode=g++" }, -+ { "clang-CC", "--driver-mode=g++" }, - { "clang-c++", "--driver-mode=g++" }, - { "clang-cc", 0 }, - { "clang-cpp", "--driver-mode=cpp" }, -@@ -221,6 +222,7 @@ static void ParseProgName(SmallVectorImpl<const ch - { "clang-g++", "--driver-mode=g++" }, - { "clang-gcc", 0 }, - { "clang-cl", "--driver-mode=cl" }, -+ { "CC", "--driver-mode=g++" }, - { "cc", 0 }, - { "cpp", "--driver-mode=cpp" }, - { "cl" , "--driver-mode=cl" }, diff --git a/contrib/llvm/tools/clang/tools/driver/driver.cpp b/contrib/llvm/tools/clang/tools/driver/driver.cpp index 3ff200b..4bbed6e 100644 --- a/contrib/llvm/tools/clang/tools/driver/driver.cpp +++ b/contrib/llvm/tools/clang/tools/driver/driver.cpp @@ -215,14 +215,12 @@ static void ParseProgName(SmallVectorImpl<const char *> &ArgVector, } suffixes [] = { { "clang", 0 }, { "clang++", "--driver-mode=g++" }, - { "clang-CC", "--driver-mode=g++" }, { "clang-c++", "--driver-mode=g++" }, { "clang-cc", 0 }, { "clang-cpp", "--driver-mode=cpp" }, { "clang-g++", "--driver-mode=g++" }, { "clang-gcc", 0 }, { "clang-cl", "--driver-mode=cl" }, - { "CC", "--driver-mode=g++" }, { "cc", 0 }, { "cpp", "--driver-mode=cpp" }, { "cl" , "--driver-mode=cl" }, diff --git a/usr.bin/clang/clang/CC.sh b/usr.bin/clang/clang/CC.sh new file mode 100755 index 0000000..45faeec --- /dev/null +++ b/usr.bin/clang/clang/CC.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# $FreeBSD$ +# This file is in the public domain. +exec /usr/bin/c++ "$@" diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index ac6e685..5f963be 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -18,9 +18,11 @@ LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ MLINKS= clang.1 clang++.1 \ clang.1 clang-cpp.1 .if ${MK_CLANG_IS_CC} != "no" +SCRIPTS=CC.sh +SCRIPTSNAME=CC + LINKS+= ${BINDIR}/clang ${BINDIR}/cc \ ${BINDIR}/clang ${BINDIR}/c++ \ - ${BINDIR}/clang ${BINDIR}/CC \ ${BINDIR}/clang ${BINDIR}/cpp MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \ |