D19480.id54774.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19480.id54774.diff
View Options

	Index: gnu/usr.bin/Makefile
	===================================================================
	--- gnu/usr.bin/Makefile
	+++ 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: gnu/usr.bin/binutils/Makefile
	===================================================================
	--- gnu/usr.bin/binutils/Makefile
	+++ 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: share/mk/src.opts.mk
	===================================================================
	--- share/mk/src.opts.mk
	+++ share/mk/src.opts.mk
	@@ -426,10 +426,6 @@
	MK_LLVM_LIBUNWIND:= no
	.endif

	-.if ${MK_BINUTILS} == "no"
	-MK_GDB:= no
	-.endif
	-
	.if ${MK_CAPSICUM} == "no"
	MK_CASPER:= no
	.endif