svn commit: r344854 - in head: gnu/usr.bin gnu/usr.bin/binutils share/man/man5 share/mk

[John Baldwin]

Author: jhb
Date: Wed Mar  6 20:13:02 2019
New Revision: 344854
URL: https://svnweb.freebsd.org/changeset/base/344854

Log:
  Divorce MK_GDB from MK_BINUTILS.
  
  This permits legacy GDB to still be built and installed if
  WITHOUT_BINUTILS is set (e.g. if base/binutils is installed).
  
  Reviewed by:	emaste
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D19480

Modified:
  head/gnu/usr.bin/Makefile
  head/gnu/usr.bin/binutils/Makefile
  head/share/man/man5/src.conf.5
  head/share/mk/src.opts.mk

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Wed Mar  6 20:10:23 2019	(r344853)
+++ head/gnu/usr.bin/Makefile	Wed Mar  6 20:13:02 2019	(r344854)
@@ -7,7 +7,10 @@
 SUBDIR.${MK_GCC}+=	gperf
 .endif
 
-SUBDIR.${MK_BINUTILS}+=	binutils
+.if ${MK_GDB} != "no" || ${MK_BINUTILS} != "no"
+SUBDIR+=	binutils
+.endif
+
 SUBDIR.${MK_DIALOG}+=	dialog
 SUBDIR.${MK_GCC}+=	cc
 SUBDIR.${MK_GNU_DIFF}+=	diff3

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile	Wed Mar  6 20:10:23 2019	(r344853)
+++ head/gnu/usr.bin/binutils/Makefile	Wed Mar  6 20:13:02 2019	(r344854)
@@ -2,18 +2,19 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	doc\
-	libiberty \
+SUBDIR=	libiberty \
 	libbfd \
-	libopcodes \
-	libbinutils \
-	as \
-	objdump
+	libopcodes
 
+SUBDIR.${MK_BINUTILS}+=	doc
+SUBDIR.${MK_BINUTILS}+=	libbinutils
+SUBDIR.${MK_BINUTILS}+=	as
+SUBDIR.${MK_BINUTILS}+=	objdump
+
 # When we use ld.lld as /usr/bin/ld, do not install the non-ifunc-capable
 # GNU binutils 2.17.50 ld.
 .if ${MK_LLD_IS_LD} == "no"
-SUBDIR+=ld
+SUBDIR.${MK_BINUTILS}+=ld
 .endif
 
 SUBDIR_DEPEND_libbinutils=libbfd		# for bfdver.h

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Wed Mar  6 20:10:23 2019	(r344853)
+++ head/share/man/man5/src.conf.5	Wed Mar  6 20:13:02 2019	(r344854)
@@ -187,12 +187,6 @@ The resulting system cannot build programs from source
 .Pp
 This is a default setting on
 arm64/aarch64 and riscv/riscv64.
-When set, it enforces these options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_GDB
-.El
 .It Va WITH_BINUTILS
 Set to build and install GNU
 .Xr as 1 ,

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Wed Mar  6 20:10:23 2019	(r344853)
+++ head/share/mk/src.opts.mk	Wed Mar  6 20:13:02 2019	(r344854)
@@ -430,10 +430,6 @@ MK_${var}:=	no
 MK_LLVM_LIBUNWIND:=	no
 .endif
 
-.if ${MK_BINUTILS} == "no"
-MK_GDB:=	no
-.endif
-
 .if ${MK_CAPSICUM} == "no"
 MK_CASPER:=	no
 .endif