diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2019-03-06 20:13:02 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2019-03-06 20:13:02 +0000 |
| commit | e91609a771dd0fbbe0df5ae4ccbb4df3e18c62c5 (patch) | |
| tree | e2fd74a191f769c01371f736e3bf6fa6f2ec3f56 | |
| parent | bfdf8aa9f7baa5371cd0bad60d3f367023ac797b (diff) | |
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
Notes
Notes:
svn path=/head/; revision=344854
| -rw-r--r-- | gnu/usr.bin/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile | 15 | ||||
| -rw-r--r-- | share/man/man5/src.conf.5 | 6 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 4 |
4 files changed, 12 insertions, 18 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index a3e749508e68..8a9b0200a8a1 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -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 diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile index 191a8ad3d5c1..619454250ed8 100644 --- a/gnu/usr.bin/binutils/Makefile +++ b/gnu/usr.bin/binutils/Makefile @@ -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 diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d425422dc106..4a99e3d50dcf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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 , diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 9cb83f2ef78f..9994496742cb 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 |