Date: Tue, 26 May 2015 20:44:01 +0000 From: "dim (Dimitry Andric)" <phabric-noreply@FreeBSD.org> To: freebsd-toolchain@freebsd.org Subject: [Differential] [Updated, 8 lines] D1932: Remove the non-standard CC alias for c++ Message-ID: <70c9d07ae84c3741aea33db20e881a88@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-p7tpzdep6ftjyr4g7dv7-req@FreeBSD.org> References: <differential-rev-PHID-DREV-p7tpzdep6ftjyr4g7dv7-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--b1_70c9d07ae84c3741aea33db20e881a88 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit dim updated this revision to Diff 5715. dim added a comment. This revision now requires review to proceed. Herald added a subscriber: imp. Updated for changes in ObsoleteFiles.inc. REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D1932?vs=3900&id=5715 BRANCH /head REVISION DETAIL https://reviews.freebsd.org/D1932 AFFECTED FILES ObsoleteFiles.inc gnu/usr.bin/cc/c++/Makefile gnu/usr.bin/cc/cc/Makefile usr.bin/clang/clang/Makefile CHANGE DETAILS diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -20,11 +20,9 @@ .if ${MK_CLANG_IS_CC} != "no" 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 \ - clang.1 CC.1 \ clang.1 cpp.1 .endif diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -16,7 +16,7 @@ MLINKS= gcc.1 g++.1 .if ${MK_CLANG_IS_CC} == "no" LINKS= ${BINDIR}/gcc ${BINDIR}/cc -MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 CC.1 +MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 .endif .include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -16,7 +16,6 @@ .if ${MK_CLANG_IS_CC} == "no" LINKS= ${BINDIR}/g++ ${BINDIR}/c++ -LINKS+= ${BINDIR}/g++ ${BINDIR}/CC .endif .include <bsd.prog.mk> diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 2015mmdd: Removed the non-standard CC alias for c++ +OLD_FILES+=usr/bin/CC +OLD_FILES+=usr/share/man/man1/CC.1.gz # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1. OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: dim, emaste, theraven Cc: imp, freebsd-toolchain --b1_70c9d07ae84c3741aea33db20e881a88 Content-Type: text/x-patch; charset=utf-8; name="D1932.5715.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D1932.5715.patch" ZGlmZiAtLWdpdCBhL3Vzci5iaW4vY2xhbmcvY2xhbmcvTWFrZWZpbGUgYi91c3IuYmluL2NsYW5n L2NsYW5nL01ha2VmaWxlCi0tLSBhL3Vzci5iaW4vY2xhbmcvY2xhbmcvTWFrZWZpbGUKKysrIGIv dXNyLmJpbi9jbGFuZy9jbGFuZy9NYWtlZmlsZQpAQCAtMjAsMTEgKzIwLDkgQEAKIC5pZiAke01L X0NMQU5HX0lTX0NDfSAhPSAibm8iCiBMSU5LUys9CSR7QklORElSfS9jbGFuZyAke0JJTkRJUn0v Y2MgXAogCSR7QklORElSfS9jbGFuZyAke0JJTkRJUn0vYysrIFwKLQkke0JJTkRJUn0vY2xhbmcg JHtCSU5ESVJ9L0NDIFwKIAkke0JJTkRJUn0vY2xhbmcgJHtCSU5ESVJ9L2NwcAogTUxJTktTKz0g Y2xhbmcuMSBjYy4xIFwKIAljbGFuZy4xIGMrKy4xIFwKLQljbGFuZy4xIENDLjEgXAogCWNsYW5n LjEgY3BwLjEKIC5lbmRpZgogCmRpZmYgLS1naXQgYS9nbnUvdXNyLmJpbi9jYy9jYy9NYWtlZmls ZSBiL2dudS91c3IuYmluL2NjL2NjL01ha2VmaWxlCi0tLSBhL2dudS91c3IuYmluL2NjL2NjL01h a2VmaWxlCisrKyBiL2dudS91c3IuYmluL2NjL2NjL01ha2VmaWxlCkBAIC0xNiw3ICsxNiw3IEBA CiBNTElOS1M9CWdjYy4xIGcrKy4xCiAuaWYgJHtNS19DTEFOR19JU19DQ30gPT0gIm5vIgogTElO S1M9CSR7QklORElSfS9nY2MgJHtCSU5ESVJ9L2NjCi1NTElOS1MrPSBnY2MuMSBjYy4xIGdjYy4x IGMrKy4xIGdjYy4xIENDLjEKK01MSU5LUys9IGdjYy4xIGNjLjEgZ2NjLjEgYysrLjEgZ2NjLjEK IC5lbmRpZgogCiAuaW5jbHVkZSA8YnNkLnByb2cubWs+CmRpZmYgLS1naXQgYS9nbnUvdXNyLmJp bi9jYy9jKysvTWFrZWZpbGUgYi9nbnUvdXNyLmJpbi9jYy9jKysvTWFrZWZpbGUKLS0tIGEvZ251 L3Vzci5iaW4vY2MvYysrL01ha2VmaWxlCisrKyBiL2dudS91c3IuYmluL2NjL2MrKy9NYWtlZmls ZQpAQCAtMTYsNyArMTYsNiBAQAogCiAuaWYgJHtNS19DTEFOR19JU19DQ30gPT0gIm5vIgogTElO S1M9CSR7QklORElSfS9nKysgJHtCSU5ESVJ9L2MrKwotTElOS1MrPQkke0JJTkRJUn0vZysrICR7 QklORElSfS9DQwogLmVuZGlmCiAKIC5pbmNsdWRlIDxic2QucHJvZy5taz4KZGlmZiAtLWdpdCBh L09ic29sZXRlRmlsZXMuaW5jIGIvT2Jzb2xldGVGaWxlcy5pbmMKLS0tIGEvT2Jzb2xldGVGaWxl cy5pbmMKKysrIGIvT2Jzb2xldGVGaWxlcy5pbmMKQEAgLTM4LDYgKzM4LDkgQEAKICMgICB4YXJn cyAtbjEgfCBzb3J0IHwgdW5pcSAtZDsKICMgZG9uZQogCisjIDIwMTVtbWRkOiBSZW1vdmVkIHRo ZSBub24tc3RhbmRhcmQgQ0MgYWxpYXMgZm9yIGMrKworT0xEX0ZJTEVTKz11c3IvYmluL0NDCitP TERfRklMRVMrPXVzci9zaGFyZS9tYW4vbWFuMS9DQy4xLmd6CiAjIDIwMTUwNTI1OiBuZXcgY2xh bmcgaW1wb3J0IHdoaWNoIGJ1bXBzIHZlcnNpb24gZnJvbSAzLjYuMCB0byAzLjYuMS4KIE9MRF9G SUxFUys9dXNyL2xpYi9jbGFuZy8zLjYuMC9pbmNsdWRlL19fc3RkZGVmX21heF9hbGlnbl90LmgK IE9MRF9GSUxFUys9dXNyL2xpYi9jbGFuZy8zLjYuMC9pbmNsdWRlL19fd21taW50cmluX2Flcy5o Cgo= --b1_70c9d07ae84c3741aea33db20e881a88--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?70c9d07ae84c3741aea33db20e881a88>