svn commit: r327010 - in stable/11: lib usr.bin

[Ed Maste]

Author: emaste
Date: Wed Dec 20 00:30:31 2017
New Revision: 327010
URL: https://svnweb.freebsd.org/changeset/base/327010

Log:
  MFC r326030: Install strings unconditionally
  
  Previously it was enabled by WITH_/WITHOUT_TOOLCHAIN, but it is commonly
  expected to be available and may have non-toolchain consumers.  As it
  is now taken from the BSD-licensed ELF Tool Chain project, just install
  it unconditionally.
  
  PR:		213665, 223725
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/lib/Makefile
  stable/11/usr.bin/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/Makefile
==============================================================================
--- stable/11/lib/Makefile	Tue Dec 19 23:54:44 2017	(r327009)
+++ stable/11/lib/Makefile	Wed Dec 20 00:30:31 2017	(r327010)
@@ -49,7 +49,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	libdwarf \
 	libedit \
 	${_libefivar} \
-	${_libelftc} \
+	libelftc \
 	libevent \
 	libexecinfo \
 	libexpat \
@@ -188,7 +188,6 @@ _cuse=		libcuse
 .endif
 
 .if ${MK_TOOLCHAIN} != "no"
-_libelftc=	libelftc
 _libpe=		libpe
 .endif
 

Modified: stable/11/usr.bin/Makefile
==============================================================================
--- stable/11/usr.bin/Makefile	Tue Dec 19 23:54:44 2017	(r327009)
+++ stable/11/usr.bin/Makefile	Wed Dec 20 00:30:31 2017	(r327010)
@@ -148,6 +148,7 @@ SUBDIR=	alias \
 	split \
 	stat \
 	stdbuf \
+	strings \
 	su \
 	systat \
 	tabs \
@@ -285,7 +286,6 @@ SUBDIR.${MK_TOOLCHAIN}+=	readelf
 SUBDIR.${MK_TOOLCHAIN}+=	rpcgen
 SUBDIR.${MK_TOOLCHAIN}+=	unifdef
 SUBDIR.${MK_TOOLCHAIN}+=	size
-SUBDIR.${MK_TOOLCHAIN}+=	strings
 .if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
 SUBDIR.${MK_TOOLCHAIN}+=	xlint
 .endif