Page MenuHomeFreeBSD
Files F115637768

D19480.id54784.diff
No OneTemporary
Actions

D19480.id54784.diff
View Options

Index: head/gnu/usr.bin/Makefile
===================================================================
--- head/gnu/usr.bin/Makefile
+++ head/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
Index: head/gnu/usr.bin/binutils/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/Makefile
+++ head/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
Index: head/share/man/man5/src.conf.5
===================================================================
--- head/share/man/man5/src.conf.5
+++ head/share/man/man5/src.conf.5
@@ -187,12 +187,6 @@
.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 ,
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -430,10 +430,6 @@
MK_LLVM_LIBUNWIND:= no
.endif
-.if ${MK_BINUTILS} == "no"
-MK_GDB:= no
-.endif
-
.if ${MK_CAPSICUM} == "no"
MK_CASPER:= no
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 9:16 AM (10 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17815772
Default Alt Text
D19480.id54784.diff (1 KB)

Event Timeline