Page MenuHomeFreeBSD
Files F144473394

D18340.id51115.diff
No OneTemporary
Actions

D18340.id51115.diff
View Options

Index: gnu/usr.bin/binutils/Makefile
===================================================================
--- gnu/usr.bin/binutils/Makefile
+++ gnu/usr.bin/binutils/Makefile
@@ -8,9 +8,13 @@
libopcodes \
libbinutils \
as \
- ld \
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
+.endif
SUBDIR_DEPEND_libbinutils=libbfd # for bfdver.h
SUBDIR_DEPEND_as=libbfd libiberty libopcodes
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -208,7 +208,6 @@
OLD_FILES+=usr/bin/ld
OLD_FILES+=usr/share/man/man1/ld.1.gz
.endif
-OLD_FILES+=usr/bin/ld.bfd
OLD_FILES+=usr/bin/objdump
OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
@@ -412,6 +411,9 @@
OLD_FILES+=usr/share/man/man7/ldint.7.gz
OLD_FILES+=usr/share/man/man7/binutils.7.gz
.endif
+.if ${MK_BINUTILS} == no || ${MK_LLD_IS_LD} == yes
+OLD_FILES+=usr/bin/ld.bfd
+.endif
.if ${MK_BLACKLIST} == no
OLD_FILES+=etc/rc.d/blacklistd
Index: tools/build/options/WITHOUT_BINUTILS
===================================================================
--- tools/build/options/WITHOUT_BINUTILS
+++ tools/build/options/WITHOUT_BINUTILS
@@ -1,4 +1,9 @@
.\" $FreeBSD$
-Set to not build or install binutils (as, ld, and objdump) as part
+Set to not build or install GNU
+.Xr as 1 ,
+.Xr objdump 1 ,
+and for some CPU architectures
+.Xr ld.bfd 1
+as part
of the normal system build.
The resulting system cannot build programs from source.
Index: tools/build/options/WITH_BINUTILS
===================================================================
--- tools/build/options/WITH_BINUTILS
+++ tools/build/options/WITH_BINUTILS
@@ -1,3 +1,8 @@
.\" $FreeBSD$
-Set to build and install binutils (as, ld, and objdump) as part
+Set to build and install GNU
+.Xr as 1 ,
+.Xr objdump 1 ,
+and for some CPU architectures
+.Xr ld.bfd 1
+as part
of the normal system build.

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 3:20 PM (10 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28593322
Default Alt Text
D18340.id51115.diff (2 KB)

Event Timeline