diff options
| author | emaste <emaste@FreeBSD.org> | 2015-04-30 21:30:33 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-04-30 21:30:33 +0000 |
| commit | 8a9da57e83ceadba139a3e4fc9deeeafb6afb6b7 (patch) | |
| tree | 55d8ea01f0937ce539e1842479523e0cb65506c7 | |
| parent | f57c0156d390ee2e998358bb565810bd95cc87bb (diff) | |
| download | FreeBSD-src-8a9da57e83ceadba139a3e4fc9deeeafb6afb6b7.zip FreeBSD-src-8a9da57e83ceadba139a3e4fc9deeeafb6afb6b7.tar.gz | |
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
| -rw-r--r-- | gnu/usr.bin/cc/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | usr.bin/Makefile | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index abc9876..65dc087 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 7a4549e..1de16c8 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 557c407..8082a7f 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 |
