aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2015-08-13 17:50:47 +0000
committerEd Maste <emaste@FreeBSD.org>2015-08-13 17:50:47 +0000
commit1bc28ffccda2cc2becfd71662bd12d24b456bfcb (patch)
tree553e43b7022ace7cc459cdf9ed42281d086839e7 /usr.bin/Makefile
parentd3c2497caba3d63ccf1f8280ab2e37cfa3856dfc (diff)
downloadsrc-1bc28ffccda2cc2becfd71662bd12d24b456bfcb.tar.gz
src-1bc28ffccda2cc2becfd71662bd12d24b456bfcb.zip
Roll WITHOUT_ELFTOOLCHAIN_TOOLS into WITHOUT_TOOLCHAIN
The option was added only to ease the transition from GNU Binutils to ELF Tool Chain tools, and that process is now complete (for the viable replacements). Noting the removal in UPDATING is sufficient as we have not shipped a release with the option. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D3240
Notes
Notes: svn path=/head/; revision=286730
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 64dffa913d53..faabe6714bce 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -218,16 +218,6 @@ SUBDIR+= clang
SUBDIR+= ee
.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
-SUBDIR+= addr2line
-SUBDIR+= cxxfilt
-SUBDIR+= elfcopy
-SUBDIR+= nm
-SUBDIR+= readelf
-SUBDIR+= size
-SUBDIR+= strings
-.endif
-
.if ${MK_FILE} != "no"
SUBDIR+= file
.endif
@@ -361,10 +351,13 @@ SUBDIR+= tftp
.endif
.if ${MK_TOOLCHAIN} != "no"
+SUBDIR+= addr2line
SUBDIR+= ar
SUBDIR+= c89
SUBDIR+= c99
SUBDIR+= ctags
+SUBDIR+= cxxfilt
+SUBDIR+= elfcopy
SUBDIR+= file2c
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO gprof does not build
SUBDIR+= gprof
@@ -372,8 +365,12 @@ SUBDIR+= gprof
SUBDIR+= indent
SUBDIR+= lex
SUBDIR+= mkstr
+SUBDIR+= nm
+SUBDIR+= readelf
SUBDIR+= rpcgen
SUBDIR+= unifdef
+SUBDIR+= size
+SUBDIR+= strings
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
SUBDIR+= xlint
.endif