Date: Thu, 30 Apr 2015 21:30:41 +0000 From: "emaste (Ed Maste)" <phabric-noreply@FreeBSD.org> To: freebsd-toolchain@freebsd.org Subject: [Differential] [Closed] D2408: Add ELF Tool Chain's c++filt to the build Message-ID: <f63d1571da1b247d0c2c68fe11824bb5@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-p3szawadf7l7266bqfgt-req@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] This revision was automatically updated to reflect the committed changes. Closed by commit rS282285: Add ELF Tool Chain's c++filt to the build (authored by emaste). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D2408?vs=5108&id=5123#toc REPOSITORY rS FreeBSD src repository REVISION DETAIL https://reviews.freebsd.org/D2408 AFFECTED FILES head/gnu/usr.bin/cc/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile CHANGE DETAILS diff --git a/head/tools/build/mk/OptionalObsoleteFiles.inc b/head/tools/build/mk/OptionalObsoleteFiles.inc --- a/head/tools/build/mk/OptionalObsoleteFiles.inc +++ b/head/tools/build/mk/OptionalObsoleteFiles.inc @@ -1004,7 +1004,9 @@ .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC OLD_FILES+=usr/bin/c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} == no OLD_FILES+=usr/bin/c++filt +.endif OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/libexec/cc1plus .if ${MK_GCC} == no diff --git a/head/gnu/usr.bin/cc/Makefile b/head/gnu/usr.bin/cc/Makefile --- a/head/gnu/usr.bin/cc/Makefile +++ b/head/gnu/usr.bin/cc/Makefile @@ -12,7 +12,10 @@ .endif .if ${MK_CXX} != "no" -SUBDIR+= cc1plus c++ c++filt +SUBDIR+= cc1plus c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" +SUBDIR+= c++filt +.endif .endif .if ${MK_GCOV} != "no" diff --git a/head/usr.bin/Makefile b/head/usr.bin/Makefile --- a/head/usr.bin/Makefile +++ b/head/usr.bin/Makefile @@ -36,6 +36,7 @@ csplit \ ctlstat \ cut \ + ${_cxxfilt} \ demandoc \ dirname \ dpv \ @@ -237,6 +238,7 @@ .if ${MK_ELFTOOLCHAIN_TOOLS} != "no" _addr2line= addr2line +_cxxfilt= cxxfilt _elfcopy= elfcopy _nm= nm _readelf= readelf EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: emaste, brooks, imp Cc: imp, freebsd-toolchain [-- Attachment #2 --] diff --git a/head/tools/build/mk/OptionalObsoleteFiles.inc b/head/tools/build/mk/OptionalObsoleteFiles.inc --- a/head/tools/build/mk/OptionalObsoleteFiles.inc +++ b/head/tools/build/mk/OptionalObsoleteFiles.inc @@ -1004,7 +1004,9 @@ .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC OLD_FILES+=usr/bin/c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} == no OLD_FILES+=usr/bin/c++filt +.endif OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/libexec/cc1plus .if ${MK_GCC} == no diff --git a/head/gnu/usr.bin/cc/Makefile b/head/gnu/usr.bin/cc/Makefile --- a/head/gnu/usr.bin/cc/Makefile +++ b/head/gnu/usr.bin/cc/Makefile @@ -12,7 +12,10 @@ .endif .if ${MK_CXX} != "no" -SUBDIR+= cc1plus c++ c++filt +SUBDIR+= cc1plus c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" +SUBDIR+= c++filt +.endif .endif .if ${MK_GCOV} != "no" diff --git a/head/usr.bin/Makefile b/head/usr.bin/Makefile --- a/head/usr.bin/Makefile +++ b/head/usr.bin/Makefile @@ -36,6 +36,7 @@ csplit \ ctlstat \ cut \ + ${_cxxfilt} \ demandoc \ dirname \ dpv \ @@ -237,6 +238,7 @@ .if ${MK_ELFTOOLCHAIN_TOOLS} != "no" _addr2line= addr2line +_cxxfilt= cxxfilt _elfcopy= elfcopy _nm= nm _readelf= readelfhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f63d1571da1b247d0c2c68fe11824bb5>