From 0a06cffc15b77c8a3e4b09b880d0db4647c1ec6d Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Thu, 30 Apr 2015 21:30:33 +0000 Subject: [PATCH] Add ELF Tool Chain's c++filt to the build Differential Revision: https://reviews.freebsd.org/D2408 Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation --- gnu/usr.bin/cc/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ usr.bin/Makefile | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index abc98767484..65dc0871f3e 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -12,7 +12,10 @@ SUBDIR+= cpp .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/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7a4549e5756..1de16c86ed6 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1004,7 +1004,9 @@ OLD_DIRS+=usr/include/fs/cuse .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/usr.bin/Makefile b/usr.bin/Makefile index 557c4078bc5..8082a7fff46 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -36,6 +36,7 @@ SUBDIR= ${_addr2line} \ csplit \ ctlstat \ cut \ + ${_cxxfilt} \ demandoc \ dirname \ dpv \ @@ -237,6 +238,7 @@ SUBDIR+= ee .if ${MK_ELFTOOLCHAIN_TOOLS} != "no" _addr2line= addr2line +_cxxfilt= cxxfilt _elfcopy= elfcopy _nm= nm _readelf= readelf