Page MenuHomeFreeBSD
Files F151108227

D2408.id5123.diff
No OneTemporary
Actions

D2408.id5123.diff
View Options

Index: head/gnu/usr.bin/cc/Makefile
===================================================================
--- head/gnu/usr.bin/cc/Makefile
+++ 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"
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc
+++ 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
Index: head/usr.bin/Makefile
===================================================================
--- head/usr.bin/Makefile
+++ 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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 3:14 AM (13 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31008133
Default Alt Text
D2408.id5123.diff (1 KB)

Event Timeline