Add ELF Tool Chain's c++filt to the build
ClosedPublic
Actions

Authored by emaste on Apr 30 2015, 3:00 PM.

Details

Reviewers

brooks
imp

Commits

rS282285: Add ELF Tool Chain's c++filt to the build

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste updated this revision to Diff 5105.Apr 30 2015, 3:00 PM

emaste retitled this revision from to Add ELF Tool Chain's c++filt to the build.

emaste updated this object.

emaste edited the test plan for this revision. (Show Details)

emaste added a reviewer: brooks.

emaste added a subscriber: Unknown Object (MLST).

Oh - we also need either:

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index abc9876..12ee7f8 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_TOLOLS} != "no"
+SUBDIR+= c++filt
+.endif
 .endif
 
 .if ${MK_GCOV} != "no"

--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -238,7 +238,9 @@ SUBDIR+=    ee
 
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _addr2line=    addr2line
+.if ${MK_GCC} != "no" && ${MK_CXX} != "no"
 _cxxfilt=      cxxfilt
+.endif
 _elfcopy=      elfcopy
 _nm=           nm
 _readelf=      readelf

s/MK_ELFTOOLCHAIN_TOLOLS/MK_ELFTOOLCHAIN_TOOLS/ required :)

prefer ELF Tool Chain's c++filt
exclude from make delete-old
fix typo

emaste added inline comments.Apr 30 2015, 3:41 PM

gnu/usr.bin/cc/Makefile
16 ↗	(On Diff #5108)	Sigh, this is backwards. Will update to `== "no"` - i.e., build GCC's c++filt in the `WITHOUT_ELFTOOLCHAIN_TOOLS` case.

Looks good to me.

This revision is now accepted and ready to land.Apr 30 2015, 3:43 PM

I came to troll you for TOLO -> YOLO, but brooks beat me to it...

Closed by commit rS282285: Add ELF Tool Chain's c++filt to the build (authored by emaste). · Explain WhyApr 30 2015, 9:30 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

usr.bin/

Makefile

2 lines

cxxfilt/

Makefile

17 lines

Diff 5105

View Options

usr.bin/Makefile

	Show All 21 Lines

	OPTIONS_DEFINE= DOCS NLS			OPTIONS_DEFINE= DOCS NLS
	OPTIONS_SUB= yes			OPTIONS_SUB= yes

	NLS_USES= gettext			NLS_USES= gettext
	NLS_CPPFLAGS+= -I${LOCALBASE}/include			NLS_CPPFLAGS+= -I${LOCALBASE}/include
	NLS_LDFLAGS+= -L${LOCALBASE}/lib			NLS_LDFLAGS+= -L${LOCALBASE}/lib

	.include <bsd.port.options.mk>			post-patch-DOCS-off:
				chris_bsdjunk.comUnsubmitted Not Done Inline Actions And more... chris_bsdjunk.com: And more...

	post-patch:
	.if empty(PORT_OPTIONS:MDOCS)
	@${REINPLACE_CMD} -e 's\|doc\|\|g' ${WRKSRC}/Makefile.in			@${REINPLACE_CMD} -e 's\|doc\|\|g' ${WRKSRC}/Makefile.in
	.endif			post-patch-NLS-off:
	.if empty(PORT_OPTIONS:MNLS)
	@${REINPLACE_CMD} -e 's\| po \| \|g' ${WRKSRC}/Makefile.in			@${REINPLACE_CMD} -e 's\| po \| \|g' ${WRKSRC}/Makefile.in
	.endif

	.include <bsd.port.mk>			.include <bsd.port.mk>