Page MenuHomeFreeBSD
Files F147392464

D2408.id5108.diff
No OneTemporary
Actions

D2408.id5108.diff
View Options

Index: gnu/usr.bin/cc/Makefile
===================================================================
--- gnu/usr.bin/cc/Makefile
+++ 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"
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ 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
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ 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
Index: usr.bin/cxxfilt/Makefile
===================================================================
--- /dev/null
+++ usr.bin/cxxfilt/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+SRCDIR= ${ELFTCDIR}/cxxfilt
+
+.PATH: ${SRCDIR}
+
+PROG= c++filt
+SRCS= cxxfilt.c
+
+LIBADD= elftc
+
+CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
+
+.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 11, 2:42 PM (4 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29541855
Default Alt Text
D2408.id5108.diff (1 KB)

Event Timeline