Author: dim
Date: Wed Dec 30 16:14:30 2015
New Revision: 292950
URL: https://svnweb.freebsd.org/changeset/base/292950
Log:
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.
MFC after: 1 week
Added:
head/usr.bin/clang/clang/CC.sh (contents, props changed)
Deleted:
head/contrib/llvm/patches/patch-02-add-CC-aliases.diff
Modified:
head/contrib/llvm/tools/clang/tools/driver/driver.cpp
head/usr.bin/clang/clang/Makefile
Modified: head/contrib/llvm/tools/clang/tools/driver/driver.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/tools/driver/driver.cpp Wed Dec 30
15:01:47 2015 (r292949)
+++ head/contrib/llvm/tools/clang/tools/driver/driver.cpp Wed Dec 30
16:14:30 2015 (r292950)
@@ -214,13 +214,11 @@ static const DriverSuffix *FindDriverSuf
{"clang", nullptr},
{"clang++", "--driver-mode=g++"},
{"clang-c++", "--driver-mode=g++"},
- {"clang-CC", "--driver-mode=g++"},
{"clang-cc", nullptr},
{"clang-cpp", "--driver-mode=cpp"},
{"clang-g++", "--driver-mode=g++"},
{"clang-gcc", nullptr},
{"clang-cl", "--driver-mode=cl"},
- {"CC", "--driver-mode=g++"},
{"cc", nullptr},
{"cpp", "--driver-mode=cpp"},
{"cl", "--driver-mode=cl"},
Added: head/usr.bin/clang/clang/CC.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/clang/clang/CC.sh Wed Dec 30 16:14:30 2015
(r292950)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $FreeBSD$
+# This file is in the public domain.
+exec /usr/bin/c++ "$@"
Modified: head/usr.bin/clang/clang/Makefile
==============================================================================
--- head/usr.bin/clang/clang/Makefile Wed Dec 30 15:01:47 2015
(r292949)
+++ head/usr.bin/clang/clang/Makefile Wed Dec 30 16:14:30 2015
(r292950)
@@ -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 \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
