Date: Tue, 12 Jan 2016 19:33:44 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r293782 - in stable: 10/contrib/llvm/patches 10/contrib/llvm/tools/clang/tools/driver 10/usr.bin/clang/clang 9/contrib/llvm/patches 9/contrib/llvm/tools/clang/tools/driver 9/usr.bin/cla... Message-ID: <201601121933.u0CJXicF036051@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Jan 12 19:33:43 2016 New Revision: 293782 URL: https://svnweb.freebsd.org/changeset/base/293782 Log: 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. Added: stable/9/usr.bin/clang/clang/CC.sh - copied unchanged from r292950, head/usr.bin/clang/clang/CC.sh Deleted: stable/9/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Modified: stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp stable/9/usr.bin/clang/clang/Makefile Directory Properties: stable/9/contrib/llvm/ (props changed) stable/9/contrib/llvm/tools/clang/ (props changed) stable/9/usr.bin/clang/ (props changed) Changes in other areas also in this revision: Added: stable/10/usr.bin/clang/clang/CC.sh - copied unchanged from r292950, head/usr.bin/clang/clang/CC.sh Deleted: stable/10/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff Modified: stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp stable/10/usr.bin/clang/clang/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Jan 12 18:42:00 2016 (r293781) +++ stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Jan 12 19:33:43 2016 (r293782) @@ -215,14 +215,12 @@ static void ParseProgName(SmallVectorImp } 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" }, Copied: stable/9/usr.bin/clang/clang/CC.sh (from r292950, head/usr.bin/clang/clang/CC.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/usr.bin/clang/clang/CC.sh Tue Jan 12 19:33:43 2016 (r293782, copy of r292950, head/usr.bin/clang/clang/CC.sh) @@ -0,0 +1,4 @@ +#!/bin/sh +# $FreeBSD$ +# This file is in the public domain. +exec /usr/bin/c++ "$@" Modified: stable/9/usr.bin/clang/clang/Makefile ============================================================================== --- stable/9/usr.bin/clang/clang/Makefile Tue Jan 12 18:42:00 2016 (r293781) +++ stable/9/usr.bin/clang/clang/Makefile Tue Jan 12 19:33:43 2016 (r293782) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601121933.u0CJXicF036051>